Merge branch 'dev/v1.1.24_wh' of BaseService/jyMicroservices into feature/v1.1.24

jyBXSubscribe/rpc/model/push.go

@@ -1823,6 +1823,7 @@ func MergeArray(dest []interface{}, src []interface{}) (result []interface{}) {
 	return
 }
 func (s *subscribePush) ItemToKey(in *SubPushQueryParam) string {
+	s.ModuleFlag = in.UserType
 	spqp := KeyParam{
 		UserId:       in.UserId,
 		EntUserId:    in.EntUserId,