Merge branch 'dev_v1.2.14_wh' of moapp/MessageCenter into feature/v1.2.14

rpc/etc/message.yaml

@@ -66,10 +66,7 @@ WxTmplConfig:
 Tidb: "root:=PDT49#80Z!RVv52_z@tcp(192.168.3.217:4000)/messageCenter?charset=utf8mb4&parseTime=true&loc=Local"
 ClassSearchList: # 需要按照messageClass 查询的groupId
   - 11  # 待办 group id
-<<<<<<< HEAD
-EquityInfoMsgType: 13 #营销权益消息需要特殊处理
 Registedate: 1705556502
-=======
 Clickhouse:
   Addr: 192.168.3.207:19000
   UserName: jytop
@@ -80,4 +77,3 @@ Clickhouse:
 GlobMsgLoadTime: "0 0/5 * * * *"
 EquityInfoMsgType: 13 #营销权益消息需要特殊处理
 NewUserMsgTitle: 做任务赚好礼
->>>>>>> master

rpc/internal/config/config.go

@@ -23,12 +23,8 @@ type Config struct {
 		Pwd  string `json:"pwd"`
 		User string `json:"user"`
 	} `json:"mail"`
-	TidbEng           string  `json:"Tidb"`
-<<<<<<< HEAD
-	ClassSearchList   []int64 `json:"ClassSearchList"`   // 需要按照messageclass 查询的groupId
-	EquityInfoMsgType int64   `json:"EquityInfoMsgType"` // 营销权益消息需要特殊处理的消息类型
+	TidbEng           string `json:"Tidb"`
 	Registedate       int64
-=======
 	ClassSearchList   []int64 `json:"ClassSearchList"` // 需要按照messageclass 查询的groupId
 	Clickhouse        *CHouseConfig
 	GlobMsgLoadTime   string `json:"GlobMsgLoadTime"`
@@ -43,7 +39,6 @@ type CHouseConfig struct {
 	DbName       string
 	MaxIdleConns int
 	MaxOpenConns int
->>>>>>> master
 }
 
 type mysqlConfig struct {