Merge branch 'feature/yujt_propertyInit' of http://121.42.41.42:7070/r/epdc-cloud-client-yushan into feature/yujt_propertyInit

epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java

@@ -112,50 +112,50 @@ public interface GroupNoticeConstant {
     /**
      * 消息所属业务类型：社群审核通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_PASSED = "propertyGroupPassed";
+    String NOTICE_BUSINESS_TYPE_GROUP_PASSED = "groupPassed";
 
     /**
      * 消息所属业务类型：社群审核未通过或解散
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_NOT_PASSED_OR_DISBAND = "propertyGroupNotPassedOrDisband";
+    String NOTICE_BUSINESS_TYPE_GROUP_NOT_PASSED_OR_DISBAND = "groupNotPassedOrDisband";
 
     /**
      * 消息所属业务类型：移除社群成员
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REMOVED_MEMBER = "propertyGroupRemovedMember";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REMOVED_MEMBER = "groupRemovedMember";
 
     /**
      * 消息所属业务类型：退出社群
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_QUIT = "propertyGroupQuit";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_QUIT = "groupQuit";
 
     /**
      * 社群邀请
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_INVITED = "propertyGroupInvited";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_INVITED = "groupInvited";
 
     /**
      * 入群申请通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_PASSED = "propertyGroupUserReviewPassed";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_PASSED = "groupUserReviewPassed";
 
     /**
      * 入群申请未通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS = "propertyGroupUserReviewNotPass";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS = "groupUserReviewNotPass";
 
     /**
      * 话题关闭
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_TOPIC_CLOSED = "propertyGroupTopicClosed";
+    String NOTICE_BUSINESS_TYPE_GROUP_TOPIC_CLOSED = "groupTopicClosed";
 
     /**
      * 话题转议题通过
      */
-    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED = "propertyTopicToIssuePass";
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED = "topicToIssuePass";
 
     /**
      * 话题转议题不通过
      */
-    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_NOT_PASSED = "propertyTopicToIssueNotPassed ";
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_NOT_PASSED = "topicToIssueNotPassed ";
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupNoticeConstant.java

@@ -112,50 +112,50 @@ public interface GroupNoticeConstant {
     /**
      * 消息所属业务类型：社群审核通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_PASSED = "groupPassed";
+    String NOTICE_BUSINESS_TYPE_GROUP_PASSED = "propertyGroupPassed";
 
     /**
      * 消息所属业务类型：社群审核未通过或解散
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_NOT_PASSED_OR_DISBAND = "groupNotPassedOrDisband";
+    String NOTICE_BUSINESS_TYPE_GROUP_NOT_PASSED_OR_DISBAND = "propertyGroupNotPassedOrDisband";
 
     /**
      * 消息所属业务类型：移除社群成员
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REMOVED_MEMBER = "groupRemovedMember";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REMOVED_MEMBER = "propertyGroupRemovedMember";
 
     /**
      * 消息所属业务类型：退出社群
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_QUIT = "groupQuit";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_QUIT = "propertyGroupQuit";
 
     /**
      * 社群邀请
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_INVITED = "groupInvited";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_INVITED = "propertyGroupInvited";
 
     /**
      * 入群申请通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_PASSED = "groupUserReviewPassed";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_PASSED = "propertyGroupUserReviewPassed";
 
     /**
      * 入群申请未通过
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS = "groupUserReviewNotPass";
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS = "propertyGroupUserReviewNotPass";
 
     /**
      * 话题关闭
      */
-    String NOTICE_BUSINESS_TYPE_GROUP_TOPIC_CLOSED = "groupTopicClosed";
+    String NOTICE_BUSINESS_TYPE_GROUP_TOPIC_CLOSED = "propertyGroupTopicClosed";
 
     /**
      * 话题转议题通过
      */
-    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED = "topicToIssuePass";
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED = "propertyTopicToIssuePass";
 
     /**
      * 话题转议题不通过
      */
-    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_NOT_PASSED = "topicToIssueNotPassed ";
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_NOT_PASSED = "propertyTopicToIssueNotPassed ";
 }