Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!999

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/PromoterMsgController.java

@@ -47,7 +47,7 @@ public class PromoterMsgController extends BaseApiController {
         queryWrapper.eq("t1.level", -1);
         queryWrapper.eq("t1.is_deleted", 0);
 
-        queryWrapper.like(StringUtils.isNotBlank(param.getSiteName()), "t2.site_name", param.getSiteName());
+        queryWrapper.like(StringUtils.isNotBlank(param.getSiteName()), "t2.name", param.getSiteName());
         queryWrapper.like(StringUtils.isNotBlank(param.getName()), "t1.name", param.getName());
         queryWrapper.eq(StringUtils.isNotBlank(param.getMobile()), "t1.mobile", param.getMobile());
 

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -123,7 +123,7 @@
              t1.mobile,
              t1.comm_rate,
              t1.created_time,
-             t2.site_name,
+             t2.name as siteName,
             if(t3.sale_num is null ,0,t3.sale_num) as sale_num,
             if(t3.sale_amt is null ,0,t3.sale_amt) as sale_amt,
             if(t4.comm_amt is null ,0,t4.comm_amt) as comm_amt