Merge branch 'dev2.3.12' of http://192.168.3.207:8080/group3/qmx_admin into dev2.3.12

src/customerService/customController.go

@@ -44,7 +44,7 @@ func CustomSendMsg(context *admin.Context) (interface{}, error) {
 	}, err
 }
 
-func MycustomerList(context *admin.Context) (interface{}, error) {
+func MyCustomerList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		State           string `form:"state"`           //客户状态
 		UpdateTimeStart string `form:"updateTimeStart"` //最近更新时间筛选开始时间

src/customerService/customService.go

@@ -83,6 +83,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			"link":        param.Link,
 			"isdel":       1,
 			"send_userid": loginUserId,
+			"send_name":   loginUserName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送

src/customerService/newsService.go

@@ -596,6 +596,7 @@ func SendMsg(param *Message, sendStatus int, loginUserName string, loginUserId i
 			"link":        param.Link,
 			"isdel":       1,
 			"send_userid": loginUserId,
+			"send_name":   loginUserName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送