submit

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreMenu.java

@@ -69,7 +69,7 @@ private static final long serialVersionUID=1L;
     /** 店铺ID */
     private Long storeId;
     /** 商户ID */
-    private Long companyId;
+    private Long merId;
 
     /** 请求参数 */
     @TableField(exist = false)

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreRole.java

@@ -62,7 +62,7 @@ private static final long serialVersionUID=1L;
     /** 店铺ID */
     private Long storeId;
     /** 商户ID */
-    private Long companyId;
+    private Long merId;
 
     @Value("true")
     /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreRoleMenu.java

@@ -28,5 +28,5 @@ private static final long serialVersionUID=1L;
     /** 店铺ID */
     private Long storeId;
     /** 商户ID */
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreUser.java

@@ -59,7 +59,7 @@ private static final long serialVersionUID=1L;
     /** 店铺ID */
     private Long storeId;
     /** 商户ID */
-    private Long companyId;
+    private Long merId;
 
     private Integer administrator;
 

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreUserRole.java

@@ -1,13 +1,11 @@
 package com.zhongzheng.common.core.domain.entity.store;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 store_user_role
@@ -30,5 +28,5 @@ private static final long serialVersionUID=1L;
     /** 店铺ID */
     private Long storeId;
     /** 商户ID */
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCategoryBo.java

@@ -39,5 +39,5 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("")
     private Long tenantId;
     @ApiModelProperty("店铺ID")
-    private Long storeId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsCategory.java

@@ -40,5 +40,5 @@ private static final long serialVersionUID=1L;
 
     private Long storeId;
 
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsCategoryVo.java

@@ -41,6 +41,8 @@ private static final long serialVersionUID=1L;
     private Long tenantId;
     @ApiModelProperty("店铺ID")
     private Long storeId;
+    @ApiModelProperty("商户ID")
+    private Long merId;
 
     @ApiModelProperty("子类目")
     private List<GoodsCategoryVo> children;

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreMenuAddBo.java

@@ -76,5 +76,5 @@ public class StoreMenuAddBo {
     private Long storeId;
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreMenuEditBo.java

@@ -89,6 +89,6 @@ public class StoreMenuEditBo {
 
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreMenuQueryBo.java

@@ -77,5 +77,5 @@ public class StoreMenuQueryBo extends BaseEntity {
 	private Long storeId;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleAddBo.java

@@ -64,5 +64,5 @@ public class StoreRoleAddBo {
     private Long storeId;
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleEditBo.java

@@ -69,6 +69,6 @@ public class StoreRoleEditBo {
 
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleMenuAddBo.java

@@ -23,5 +23,5 @@ public class StoreRoleMenuAddBo {
     private Long storeId;
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleMenuEditBo.java

@@ -32,6 +32,6 @@ public class StoreRoleMenuEditBo {
 
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleMenuQueryBo.java

@@ -41,5 +41,5 @@ public class StoreRoleMenuQueryBo extends BaseEntity {
 	private Long storeId;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreRoleQueryBo.java

@@ -62,5 +62,5 @@ public class StoreRoleQueryBo extends BaseEntity {
 	private Long storeId;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserAddBo.java

@@ -59,5 +59,5 @@ public class StoreUserAddBo {
     private Long storeId;
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserEditBo.java

@@ -72,6 +72,6 @@ public class StoreUserEditBo {
 
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserQueryBo.java

@@ -71,5 +71,5 @@ public class StoreUserQueryBo extends BaseEntity {
 	private Long storeId;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserRoleAddBo.java

@@ -23,5 +23,5 @@ public class StoreUserRoleAddBo {
     private Long storeId;
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserRoleEditBo.java

@@ -31,7 +31,7 @@ public class StoreUserRoleEditBo {
 
     /** 商户ID */
     @ApiModelProperty("商户ID")
-    private Long companyId;
+    private Long merId;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/bo/StoreUserRoleQueryBo.java

@@ -1,16 +1,11 @@
 package com.zhongzheng.modules.store.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
 /**
  * 【请填写功能名称】分页查询对象 store_user_role
  *
@@ -41,5 +36,5 @@ public class StoreUserRoleQueryBo extends BaseEntity {
 	private Long storeId;
 	/** 商户ID */
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreMenuVo.java

@@ -81,5 +81,5 @@ public class StoreMenuVo {
 	/** 商户ID */
 	@Excel(name = "商户ID")
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreRoleMenuVo.java

@@ -31,5 +31,5 @@ public class StoreRoleMenuVo {
 	/** 商户ID */
 	@Excel(name = "商户ID")
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreRoleVo.java

@@ -63,5 +63,5 @@ public class StoreRoleVo {
 	/** 商户ID */
 	@Excel(name = "商户ID")
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreUserRoleVo.java

@@ -31,5 +31,5 @@ public class StoreUserRoleVo {
 	/** 商户ID */
 	@Excel(name = "商户ID")
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreUserVo.java

@@ -1,11 +1,9 @@
 package com.zhongzheng.modules.store.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -71,5 +69,5 @@ public class StoreUserVo {
 	/** 商户ID */
 	@Excel(name = "商户ID")
 	@ApiModelProperty("商户ID")
-	private Long companyId;
+	private Long merId;
 }