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

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

@@ -47,10 +47,6 @@ 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

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