Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java

@@ -27,7 +27,12 @@ public class LogOperationListFormDTO {
      */
     private String endTime;
     /**
-     * 默认传data_tm
+     * 产品原本前端默认传data_tm
+     * 03.01烟台需求，列表展示全部
+     * 项目流转：project_changed
+     * 登录：auth
+     * 积分：point
+     * 查看脱敏信息：data_tm
      */
     private String category;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java

@@ -47,6 +47,7 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+
     /**
      * 用户ID
      */