diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 4d136a394..373166028 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -33,6 +33,7 @@ DROP TABLE IF EXISTS `mch_manage`; CREATE TABLE mch_manage ( id bigint NOT NULL COMMENT '主键', + parent_id bigint NOT NULL COMMENT '主键', dept_id bigint NOT NULL COMMENT '绑定的部门id', default_wallet_type_id bigint DEFAULT NULL COMMENT '商户默认使用的钱包类型', hard_group_id bigint COMMENT '设备分组id', @@ -45,6 +46,9 @@ CREATE TABLE mch_manage job_time varchar(256) DEFAULT NULL COMMENT '商户营业时间', address_des varchar(256) DEFAULT NULL COMMENT '商户地址', sort int NOT NULL COMMENT '排序', + discounts_price varchar(256) NOT NULL COMMENT '优惠价格(没实际作用)', + cooperation_status varchar(64) NOT NULL COMMENT '合作状态', + mch_count int NOT NULL COMMENT '分店数量', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java index 2519afbad..6f8700bbd 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java @@ -30,6 +30,12 @@ public class MchManageEntity extends Model { @Schema(description = "主键") private Long id; + /** + * 父商家id + */ + @Schema(description = "父商家id") + private Long parentId; + /** * 绑定的部门id - 商户的部门id */ @@ -118,6 +124,24 @@ public class MchManageEntity extends Model { @Schema(description = "排序") private Long sort; + /** + * 优惠价格(没实际作用) + */ + @Schema(description = "优惠价格(没实际作用)") + private String discountsPrice; + + /** + * 合作状态 + */ + @Schema(description = "合作状态") + private String cooperationStatus; + + /** + * 分店数量 + */ + @Schema(description = "分店数量") + private Long mchCount; + /** * 创建时间 */