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

优化

See merge request quanshu/mp-server!421

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelTicketTransferDetailVO.java

@@ -22,7 +22,7 @@ public class ChannelTicketTransferDetailVO {
     private String pkgNo;
 
     @ApiModelProperty("门店名称")
-    private String siteName;
+    private String channelName;
 
     @ApiModelProperty("手机号")
     private String mobile;

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

@@ -41,7 +41,7 @@
     <select id="getTicketTransferDetail" resultType="com.qs.mp.channel.domain.vo.ChannelTicketTransferDetailVO">
         SELECT t4.title,
                t3.pkg_no,
-               t2.site_name,
+               t2.name channelName,
                t2.mobile,
                t1.created_time
         FROM mp_channel_ticket_transfer t1