Merge remote-tracking branch 'origin/房屋tree_yzm'

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,11 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	/**
+	 * 组织id;0306烟台需求增加
+	 */
+	private String agencyId;
+
     /**
      * 用户ID
      */

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.95__user_badge_certificate_record.sql

@@ -0,0 +1 @@
+alter table user_badge_certificate_record add COLUMN AGENCY_ID VARCHAR(64) DEFAULT'' comment '组织id;0306烟台需求增加' AFTER grid_id;