Merge branch 'dev_mess_party' into dev_temp

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java

@@ -44,12 +44,12 @@ public interface WxmpMessageConstant {
     String CONCERN_UPDATE_TITLE_TEXT = "话题状态提醒";
     String CONCERN_UPDATE_CONTENT = "thing7";
     String CONCERN_UPDATE_CONTENT_TEXT = "你关注的话题已被转为议题，请点击查看。";
-    String CONCERN_UPDATE_TIME = "date6";
+    String CONCERN_UPDATE_TIME = "time6";
     /**关注更新提醒模板end**/
 
     /**内容更新消息通知模板start**/
     String CONTENT_UPDATE_TEMPLATE_TYPE = "2092";
-    String CONTENT_UPDATE_TITLE = "thing4";
+    String CONTENT_UPDATE_TITLE = "name4";
     String CONTENT_UPDATE_TITLE_TEXT = "新评论提醒";
     String CONTENT_UPDATE_CONTENT = "thing9";
     String CONTENT_UPDATE_CONTENT_TEXT = "你关注的话题收到新评论，请点击查看。";

epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.5__insert_customer_parameter.sql

@@ -0,0 +1,32 @@
+DELETE FROM customer_parameter;
+
+
+#===================  数据初始化  ============================
+INSERT INTO customer_parameter (ID,
+                                CUSTOMER_ID,
+                                PARAMETER_KEY,
+                                PARAMETER_NAME,
+                                PARAMETER_SWITCH,
+                                PARAMETER_VALUE,
+                                DESCRIPTION,
+                                DEL_FLAG,
+                                REVISION,
+                                CREATED_BY,
+                                CREATED_TIME,
+                                UPDATED_BY,
+                                UPDATED_TIME)
+SELECT MD5(uuid() + FLOOR(RAND() * 999999)),
+       id,
+       'send_msg',
+       '短信',
+       'off',
+       '5000',
+       '客户短信可发送次数配置',
+       '0',
+       '0',
+       'app_user',
+       NOW(),
+       'app_user',
+       NOW()
+FROM customer
+WHERE DEL_FLAG = '0'