glj-代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java

@@ -9,10 +9,11 @@ import java.util.Date;
 
 /**
  * user实体类
+ *
  * @author liyuchen
  */
 @Data
-@TableName(value ="blade_user")
+@TableName(value = "blade_user")
 public class Administrator extends BaseEntity {
 
 	private Long id;

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -364,11 +364,10 @@
         where date_format(d.disaster_time,'%Y') = #{year} and b.role_id = '1123598816738675204' GROUP BY b.`name` ORDER BY val desc limit 10
     </select>
 
+
     <select id="disasterNum" resultType="java.util.Map">
         SELECT d.dict_value as `name`, count(1) as val FROM disaster_info t INNER JOIN blade_dict_biz d on t.disaster_type = d.dict_key
                 where date_format(t.disaster_time,'%Y') = #{year} GROUP BY d.dict_value
-
-
     </select>
 
     <select id="getByUserIdRole" resultType="com.kening.vordm.vo.CallForHelpVo">