Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -150,6 +150,7 @@ public class BmsChannelController {
             BmsChannel headChannel = bmsChannelService.getById(param.getHeadChannelId());
             if(headChannel!=null){
                 param.setHeadChannel(headChannel.getChannelName());
+                param.setHeadChannelCode(headChannel.getChannelCode());
             }
         }
         boolean result = bmsChannelService.updateById(param);
@@ -188,6 +189,7 @@ public class BmsChannelController {
             BmsChannel headChannel = bmsChannelService.getById(param.getHeadChannelId());
             if(headChannel!=null){
                 param.setHeadChannel(headChannel.getChannelName());
+                param.setHeadChannelCode(headChannel.getChannelCode());
             }
         }
         bmsChannelService.save(param);

src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java

@@ -67,6 +67,8 @@ public class BmsChannel implements Serializable {
     /** 总公司渠道 */
     private String headChannel;
 
+    private String headChannelCode;
+
     /** 所属租户 */
     @JsonIgnore
     @JsonProperty

src/main/resources/mapper/bms/BmsChannelMapper.xml

@@ -10,6 +10,7 @@
         <result property="channelName"  column="channel_name"/>
         <result property="channelType"  column="channel_type"/>
         <result property="headChannel"  column="head_channel"/>
+        <result property="headChannelCode"  column="head_channel_code"/>
         <result property="headChannelId"  column="head_channel_id"/>
         <result property="remark"  column="remark"/>
         <result property="createTime"  column="create_time"/>
@@ -27,6 +28,7 @@
         bms_channel.`channel_name`,
         bms_channel.`channel_type`,
         bms_channel.`head_channel`,
+        bms_channel.`head_channel_code`,
         bms_channel.`head_channel_id`,
         bms_channel.`remark`,
         bms_channel.`create_time`,