收银点更改

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBaseInfo.java

@@ -2,7 +2,6 @@ package cn.pluss.platform.entity;
 
 import cn.pluss.platform.constants.Constant;
 import cn.pluss.platform.exception.MsgException;
-import cn.pluss.platform.util.MD5Util;
 import cn.pluss.platform.util.SignUtils;
 import cn.pluss.platform.util.StringUtil;
 import com.alibaba.fastjson.JSON;
@@ -19,7 +18,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 
 @Data
 @AllArgsConstructor
@@ -108,6 +106,16 @@ public class MerchantBaseInfo implements Serializable {
 
     private String buslicType;
     private String isVoice;
+    /**
+     * (新)多收银点主商户号
+     */
+    @TableField("masterMerchantCode")
+    private String masterMerchantCode;
+    /**
+     * 通道切换标记
+     */
+    @TableField("tab")
+    private Integer tab;
 
     /**
      * 是否推送微信消息0：不推送 1：推送
@@ -229,6 +237,9 @@ public class MerchantBaseInfo implements Serializable {
     @TableField("validFlag")
     private Integer validFlag;
 
+    @TableField(exist = false)
+    private Integer channel;
+
 
 
     public static void setFirstAndLastTradeTime(MerchantBaseInfo mbi, Date date) {

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java

@@ -70,6 +70,9 @@ public class MerchantCashPlace implements Serializable {
     @TableField("remark")
     private String remark;
 
+    @TableField(exist = false)
+    private String merchantCode;
+
 
     /**
      * 创建时间

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java

@@ -2,10 +2,6 @@ package cn.pluss.platform.vo;
 
 import cn.pluss.platform.entity.MerchantBaseInfo;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -70,4 +66,8 @@ public class MerchantCashPlaceVO implements Serializable {
      * 店铺基本信息
      */
     private MerchantBaseInfo merchantBaseInfo;
+    /**
+     * 切换
+     */
+    private Integer tab;
 }