添加基础价格数据

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicBrandEntity.java

@@ -0,0 +1,85 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 基础品牌表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_brand")
+@ApiModel(value = "BasicBrand对象", description = "基础品牌表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicBrandEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	/**
+	 * 品牌编号
+	 */
+	@ApiModelProperty(value = "品牌编号")
+	private String brandCode;
+	/**
+	 * 品牌图标
+	 */
+	@ApiModelProperty(value = "品牌图标")
+	private String brandIcon;
+	/**
+	 * 承接时间
+	 */
+	@ApiModelProperty(value = "承接时间")
+	private Date acceptanceTime;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicClientEntity.java

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 基础客户表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_client")
+@ApiModel(value = "BasicClient对象", description = "基础客户表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicClientEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String clientName;
+	/**
+	 * 客户类型;1 C端  2 B端
+	 */
+	@ApiModelProperty(value = "客户类型;1 C端  2 B端")
+	private Integer typeService;
+	/**
+	 * 省份
+	 */
+	@ApiModelProperty(value = "省份")
+	private String bladeRegionProvinceId;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(value = "市")
+	private String bladeRegionCityId;
+	/**
+	 * 区/县
+	 */
+	@ApiModelProperty(value = "区/县")
+	private String bladeRegionAreaId;
+	/**
+	 * 合同附件
+	 */
+	@ApiModelProperty(value = "合同附件")
+	private String leaseAccessories;
+	/**
+	 * 合同开始时间
+	 */
+	@ApiModelProperty(value = "合同开始时间")
+	private Date contractStartTime;
+	/**
+	 * 合同结束时间
+	 */
+	@ApiModelProperty(value = "合同结束时间")
+	private Date contractEntTime;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicFreightEntity.java

@@ -0,0 +1,191 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 基础价格记录表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_freight")
+@ApiModel(value = "BasicFreight对象", description = "基础价格记录表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicFreightEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 计算方式;1件  2方  3公斤
+	 */
+	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
+	private Integer formulaMode;
+	/**
+	 * 物品名称
+	 */
+	@ApiModelProperty(value = "物品名称")
+	private String itemName;
+	/**
+	 * 门店品牌记录表
+	 */
+	@ApiModelProperty(value = "门店品牌记录表")
+	private String storeBrandId;
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freight;
+	/**
+	 * 送货费用
+	 */
+	@ApiModelProperty(value = "送货费用")
+	private BigDecimal deliveryExpense;
+	/**
+	 * 提货费用
+	 */
+	@ApiModelProperty(value = "提货费用")
+	private BigDecimal deliveryCharge;
+	/**
+	 * 仓库管理费用
+	 */
+	@ApiModelProperty(value = "仓库管理费用")
+	private BigDecimal warehouseOverhead;
+	/**
+	 * 仓储费用
+	 */
+	@ApiModelProperty(value = "仓储费用")
+	private BigDecimal storageCharge;
+	/**
+	 * 装卸费用
+	 */
+	@ApiModelProperty(value = "装卸费用")
+	private BigDecimal terminalCharges;
+	/**
+	 * 其他费用
+	 */
+	@ApiModelProperty(value = "其他费用")
+	private BigDecimal otherCharges;
+	/**
+	 * 末端仓
+	 */
+	@ApiModelProperty(value = "末端仓")
+	private String singleColon;
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	private String forwardingUnit;
+	/**
+	 * 门店
+	 */
+	@ApiModelProperty(value = "门店")
+	private String shop;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 服务类型;1 干  2干仓  3干仓配 4干配
+	 */
+	@ApiModelProperty(value = "服务类型;1 干  2干仓  3干仓配 4干配")
+	private Integer typeService;
+	/**
+	 * 结算方;1 商场  2工厂
+	 */
+	@ApiModelProperty(value = "结算方;1 商场  2工厂")
+	private Integer clearingForm;
+	/**
+	 * 一级品类
+	 */
+	@ApiModelProperty(value = "一级品类")
+	private String firstClassCategory;
+	/**
+	 * 一口价
+	 */
+	@ApiModelProperty(value = "一口价")
+	private BigDecimal fixedPrice;
+	/**
+	 * 干线费用
+	 */
+	@ApiModelProperty(value = "干线费用")
+	private BigDecimal trunkCharge;
+	/**
+	 * 生效时间
+	 */
+	@ApiModelProperty(value = "生效时间")
+	private Date effectiveTime;
+	/**
+	 * 截至时间
+	 */
+	@ApiModelProperty(value = "截至时间")
+	private Date expirationTime;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String type;
+	/**
+	 * 标识
+	 */
+	@ApiModelProperty(value = "标识")
+	private String identification;
+	/**
+	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
+	 */
+	@ApiModelProperty(value = "仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
+	private Integer warehousingTimeCharge;
+	/**
+	 * 仓储时间端费用
+	 */
+	@ApiModelProperty(value = "仓储时间端费用")
+	private BigDecimal warehousingTimeStatus;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicHistoricalContractEntity.java

@@ -0,0 +1,85 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 客户历史合同记录 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_historical_contract")
+@ApiModel(value = "BasicHistoricalContract对象", description = "客户历史合同记录")
+@EqualsAndHashCode(callSuper = true)
+public class BasicHistoricalContractEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户id
+	 */
+	@ApiModelProperty(value = "客户id")
+	private String clientId;
+	/**
+	 * 合同开始时间
+	 */
+	@ApiModelProperty(value = "合同开始时间")
+	private String contractStartTime;
+	/**
+	 * 合同结束时间
+	 */
+	@ApiModelProperty(value = "合同结束时间")
+	private String contractEntTime;
+	/**
+	 * 合同文件
+	 */
+	@ApiModelProperty(value = "合同文件")
+	private String leaseAccessories;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicShopEntity.java

@@ -0,0 +1,120 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 基础门店表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_shop")
+@ApiModel(value = "BasicShop对象", description = "基础门店表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicShopEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ApiModelProperty(value = "客户ID")
+	private String clientId;
+	/**
+	 * 门店编码
+	 */
+	@ApiModelProperty(value = "门店编码")
+	private String storeCode;
+	/**
+	 * 门店名称
+	 */
+	@ApiModelProperty(value = "门店名称")
+	private String storeName;
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String linkman;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String phone;
+	/**
+	 * 省
+	 */
+	@ApiModelProperty(value = "省")
+	private String bladeRegionProvinceId;
+	/**
+	 * 城市
+	 */
+	@ApiModelProperty(value = "城市")
+	private String bladeRegionCityId;
+	/**
+	 * 区
+	 */
+	@ApiModelProperty(value = "区")
+	private String bladeRegionAreaId;
+	/**
+	 * 详细地址
+	 */
+	@ApiModelProperty(value = "详细地址")
+	private String detailedAddress;
+	/**
+	 * 入驻时间
+	 */
+	@ApiModelProperty(value = "入驻时间")
+	private Date checkInTime;
+	/**
+	 * 退出时间
+	 */
+	@ApiModelProperty(value = "退出时间")
+	private Date postSetTime;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStorageServicesEntity.java

@@ -0,0 +1,80 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 门店服务仓库表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_storage_services")
+@ApiModel(value = "BasicStorageServices对象", description = "门店服务仓库表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicStorageServicesEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ApiModelProperty(value = "门店ID")
+	private String shopId;
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	private String forwardingUnit;
+	/**
+	 * 服务仓库
+	 */
+	@ApiModelProperty(value = "服务仓库")
+	private String warehouseService;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreBrandEntity.java

@@ -0,0 +1,75 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 门店品牌中间表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_store_brand")
+@ApiModel(value = "BasicStoreBrand对象", description = "门店品牌中间表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreBrandEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ApiModelProperty(value = "门店ID")
+	private String shopId;
+	/**
+	 * 品牌ID
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private String brandId;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicStoreContactEntity.java

@@ -0,0 +1,80 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 基础门店联系人表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_store_contact")
+@ApiModel(value = "BasicStoreContact对象", description = "基础门店联系人表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreContactEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ApiModelProperty(value = "门店ID")
+	private String shopId;
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String linkman;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String phone;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicZonePriceEntity.java

@@ -0,0 +1,121 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 区域品牌价格表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@TableName("logpm_basic_zone_price")
+@ApiModel(value = "BasicZonePrice对象", description = "区域品牌价格表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicZonePriceEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 省
+	 */
+	@ApiModelProperty(value = "省")
+	private String province;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(value = "市")
+	private String city;
+	/**
+	 * 区/县
+	 */
+	@ApiModelProperty(value = "区/县")
+	private String district;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用
+	 */
+	@ApiModelProperty(value = "费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用")
+	private String freightMark;
+	/**
+	 * 费用
+	 */
+	@ApiModelProperty(value = "费用")
+	private String cost;
+	/**
+	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
+	 */
+	@ApiModelProperty(value = "仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
+	private Integer warehousingTimeStatus;
+	/**
+	 * 仓储时间端费用
+	 */
+	@ApiModelProperty(value = "仓储时间端费用")
+	private BigDecimal warehousingTimeCharge;
+	/**
+	 * 末端仓
+	 */
+	@ApiModelProperty(value = "末端仓")
+	private String goalGranary;
+	/**
+	 * 标识
+	 */
+	@ApiModelProperty(value = "标识")
+	private Integer identification;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private Integer condition;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicBrandClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础品牌表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicBrand"
+)
+public interface IBasicBrandClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top1";
+
+    /**
+     * 获取基础品牌表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicClientClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicClientEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础客户表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicClient"
+)
+public interface IBasicClientClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top2";
+
+    /**
+     * 获取基础客户表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicClientEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicFreightClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础价格记录表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicFreight"
+)
+public interface IBasicFreightClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top11";
+
+    /**
+     * 获取基础价格记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicFreightEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicHistoricalContractClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 客户历史合同记录 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicHistoricalContract"
+)
+public interface IBasicHistoricalContractClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top22";
+
+    /**
+     * 获取客户历史合同记录列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicHistoricalContractEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicShopClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicShopEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础门店表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicShop"
+)
+public interface IBasicShopClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top3";
+
+    /**
+     * 获取基础门店表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicShopEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStorageServicesClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 门店服务仓库表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicStorageServices"
+)
+public interface IBasicStorageServicesClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top44";
+
+    /**
+     * 获取门店服务仓库表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicStorageServicesEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStoreBrandClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础品牌表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicBrand"
+)
+public interface IBasicStoreBrandClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top4";
+
+    /**
+     * 获取基础品牌表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicStoreBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicStoreContactClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 基础门店联系人表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicStoreContact"
+)
+public interface IBasicStoreContactClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top55";
+
+    /**
+     * 获取基础门店联系人表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicStoreContactEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicZonePriceClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 区域品牌价格表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@FeignClient(
+    value = "basicZonePrice"
+)
+public interface IBasicZonePriceClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top66";
+
+    /**
+     * 获取区域品牌价格表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicZonePriceEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicBrandVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础品牌表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicBrandVO extends BasicBrandEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicClientVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicClientEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础客户表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicClientVO extends BasicClientEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicFreightVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础价格记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicFreightVO extends BasicFreightEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicHistoricalContractVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户历史合同记录 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicHistoricalContractVO extends BasicHistoricalContractEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicShopVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicShopEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础门店表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicShopVO extends BasicShopEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStorageServicesVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 门店服务仓库表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStorageServicesVO extends BasicStorageServicesEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStoreBrandVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 门店品牌中间表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreBrandVO extends BasicStoreBrandEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicStoreContactVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础门店联系人表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreContactVO extends BasicStoreContactEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicZonePriceVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 区域品牌价格表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicZonePriceVO extends BasicZonePriceEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicBrandController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import com.logpm.basicdata.vo.BasicBrandVO;
+import com.logpm.basicdata.excel.BasicBrandExcel;
+import com.logpm.basicdata.service.IBasicBrandService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 基础品牌表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicBrand")
+@Api(value = "基础品牌表", tags = "基础品牌表接口")
+public class BasicBrandController extends BladeController {
+
+	private final IBasicBrandService basicBrandService;
+
+	/**
+	 * 基础品牌表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicBrand")
+	public R<BasicBrandEntity> detail(BasicBrandEntity basicBrand) {
+		BasicBrandEntity detail = basicBrandService.getOne(Condition.getQueryWrapper(basicBrand));
+		return R.data(detail);
+	}
+	/**
+	 * 基础品牌表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicBrand")
+	public R<IPage<BasicBrandEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicBrand, Query query) {
+		IPage<BasicBrandEntity> pages = basicBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicBrand, BasicBrandEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础品牌表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicBrand")
+	public R<IPage<BasicBrandVO>> page(BasicBrandVO basicBrand, Query query) {
+		IPage<BasicBrandVO> pages = basicBrandService.selectBasicBrandPage(Condition.getPage(query), basicBrand);
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础品牌表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicBrand")
+	public R save(@Valid @RequestBody BasicBrandEntity basicBrand) {
+		return R.status(basicBrandService.save(basicBrand));
+	}
+
+	/**
+	 * 基础品牌表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicBrand")
+	public R update(@Valid @RequestBody BasicBrandEntity basicBrand) {
+		return R.status(basicBrandService.updateById(basicBrand));
+	}
+
+	/**
+	 * 基础品牌表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicBrand")
+	public R submit(@Valid @RequestBody BasicBrandEntity basicBrand) {
+		return R.status(basicBrandService.saveOrUpdate(basicBrand));
+	}
+
+	/**
+	 * 基础品牌表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicBrandService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicBrand")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicBrand")
+	public void exportBasicBrand(@ApiIgnore @RequestParam Map<String, Object> basicBrand, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicBrandEntity> queryWrapper = Condition.getQueryWrapper(basicBrand, BasicBrandEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicBrand::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicBrandExcel> list = basicBrandService.exportBasicBrand(queryWrapper);
+		ExcelUtil.export(response, "基础品牌表数据" + DateUtil.time(), "基础品牌表数据表", list, BasicBrandExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicClientController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicClientEntity;
+import com.logpm.basicdata.vo.BasicClientVO;
+import com.logpm.basicdata.excel.BasicClientExcel;
+import com.logpm.basicdata.service.IBasicClientService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 基础客户表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicClient")
+@Api(value = "基础客户表", tags = "基础客户表接口")
+public class BasicClientController extends BladeController {
+
+	private final IBasicClientService basicClientService;
+
+	/**
+	 * 基础客户表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicClient")
+	public R<BasicClientEntity> detail(BasicClientEntity basicClient) {
+		BasicClientEntity detail = basicClientService.getOne(Condition.getQueryWrapper(basicClient));
+		return R.data(detail);
+	}
+	/**
+	 * 基础客户表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicClient")
+	public R<IPage<BasicClientEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicClient, Query query) {
+		IPage<BasicClientEntity> pages = basicClientService.page(Condition.getPage(query), Condition.getQueryWrapper(basicClient, BasicClientEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础客户表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicClient")
+	public R<IPage<BasicClientVO>> page(BasicClientVO basicClient, Query query) {
+		IPage<BasicClientVO> pages = basicClientService.selectBasicClientPage(Condition.getPage(query), basicClient);
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础客户表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicClient")
+	public R save(@Valid @RequestBody BasicClientEntity basicClient) {
+		return R.status(basicClientService.save(basicClient));
+	}
+
+	/**
+	 * 基础客户表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicClient")
+	public R update(@Valid @RequestBody BasicClientEntity basicClient) {
+		return R.status(basicClientService.updateById(basicClient));
+	}
+
+	/**
+	 * 基础客户表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicClient")
+	public R submit(@Valid @RequestBody BasicClientEntity basicClient) {
+		return R.status(basicClientService.saveOrUpdate(basicClient));
+	}
+
+	/**
+	 * 基础客户表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicClientService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicClient")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicClient")
+	public void exportBasicClient(@ApiIgnore @RequestParam Map<String, Object> basicClient, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicClientEntity> queryWrapper = Condition.getQueryWrapper(basicClient, BasicClientEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicClient::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicClientEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicClientExcel> list = basicClientService.exportBasicClient(queryWrapper);
+		ExcelUtil.export(response, "基础客户表数据" + DateUtil.time(), "基础客户表数据表", list, BasicClientExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicFreightController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import com.logpm.basicdata.vo.BasicFreightVO;
+import com.logpm.basicdata.excel.BasicFreightExcel;
+import com.logpm.basicdata.service.IBasicFreightService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 基础价格记录表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicFreight")
+@Api(value = "基础价格记录表", tags = "基础价格记录表接口")
+public class BasicFreightController extends BladeController {
+
+	private final IBasicFreightService basicFreightService;
+
+	/**
+	 * 基础价格记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicFreight")
+	public R<BasicFreightEntity> detail(BasicFreightEntity basicFreight) {
+		BasicFreightEntity detail = basicFreightService.getOne(Condition.getQueryWrapper(basicFreight));
+		return R.data(detail);
+	}
+	/**
+	 * 基础价格记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicFreight")
+	public R<IPage<BasicFreightEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicFreight, Query query) {
+		IPage<BasicFreightEntity> pages = basicFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(basicFreight, BasicFreightEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础价格记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicFreight")
+	public R<IPage<BasicFreightVO>> page(BasicFreightVO basicFreight, Query query) {
+		IPage<BasicFreightVO> pages = basicFreightService.selectBasicFreightPage(Condition.getPage(query), basicFreight);
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础价格记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicFreight")
+	public R save(@Valid @RequestBody BasicFreightEntity basicFreight) {
+		return R.status(basicFreightService.save(basicFreight));
+	}
+
+	/**
+	 * 基础价格记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicFreight")
+	public R update(@Valid @RequestBody BasicFreightEntity basicFreight) {
+		return R.status(basicFreightService.updateById(basicFreight));
+	}
+
+	/**
+	 * 基础价格记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicFreight")
+	public R submit(@Valid @RequestBody BasicFreightEntity basicFreight) {
+		return R.status(basicFreightService.saveOrUpdate(basicFreight));
+	}
+
+	/**
+	 * 基础价格记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicFreightService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicFreight")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicFreight")
+	public void exportBasicFreight(@ApiIgnore @RequestParam Map<String, Object> basicFreight, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicFreightEntity> queryWrapper = Condition.getQueryWrapper(basicFreight, BasicFreightEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicFreight::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicFreightEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicFreightExcel> list = basicFreightService.exportBasicFreight(queryWrapper);
+		ExcelUtil.export(response, "基础价格记录表数据" + DateUtil.time(), "基础价格记录表数据表", list, BasicFreightExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicHistoricalContractController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import com.logpm.basicdata.vo.BasicHistoricalContractVO;
+import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
+import com.logpm.basicdata.service.IBasicHistoricalContractService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客户历史合同记录 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicHistoricalContract")
+@Api(value = "客户历史合同记录", tags = "客户历史合同记录接口")
+public class BasicHistoricalContractController extends BladeController {
+
+	private final IBasicHistoricalContractService basicHistoricalContractService;
+
+	/**
+	 * 客户历史合同记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicHistoricalContract")
+	public R<BasicHistoricalContractEntity> detail(BasicHistoricalContractEntity basicHistoricalContract) {
+		BasicHistoricalContractEntity detail = basicHistoricalContractService.getOne(Condition.getQueryWrapper(basicHistoricalContract));
+		return R.data(detail);
+	}
+	/**
+	 * 客户历史合同记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicHistoricalContract")
+	public R<IPage<BasicHistoricalContractEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicHistoricalContract, Query query) {
+		IPage<BasicHistoricalContractEntity> pages = basicHistoricalContractService.page(Condition.getPage(query), Condition.getQueryWrapper(basicHistoricalContract, BasicHistoricalContractEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户历史合同记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicHistoricalContract")
+	public R<IPage<BasicHistoricalContractVO>> page(BasicHistoricalContractVO basicHistoricalContract, Query query) {
+		IPage<BasicHistoricalContractVO> pages = basicHistoricalContractService.selectBasicHistoricalContractPage(Condition.getPage(query), basicHistoricalContract);
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户历史合同记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicHistoricalContract")
+	public R save(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
+		return R.status(basicHistoricalContractService.save(basicHistoricalContract));
+	}
+
+	/**
+	 * 客户历史合同记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicHistoricalContract")
+	public R update(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
+		return R.status(basicHistoricalContractService.updateById(basicHistoricalContract));
+	}
+
+	/**
+	 * 客户历史合同记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicHistoricalContract")
+	public R submit(@Valid @RequestBody BasicHistoricalContractEntity basicHistoricalContract) {
+		return R.status(basicHistoricalContractService.saveOrUpdate(basicHistoricalContract));
+	}
+
+	/**
+	 * 客户历史合同记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicHistoricalContractService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicHistoricalContract")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicHistoricalContract")
+	public void exportBasicHistoricalContract(@ApiIgnore @RequestParam Map<String, Object> basicHistoricalContract, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicHistoricalContractEntity> queryWrapper = Condition.getQueryWrapper(basicHistoricalContract, BasicHistoricalContractEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicHistoricalContract::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicHistoricalContractEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicHistoricalContractExcel> list = basicHistoricalContractService.exportBasicHistoricalContract(queryWrapper);
+		ExcelUtil.export(response, "客户历史合同记录数据" + DateUtil.time(), "客户历史合同记录数据表", list, BasicHistoricalContractExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicShopController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicShopEntity;
+import com.logpm.basicdata.vo.BasicShopVO;
+import com.logpm.basicdata.excel.BasicShopExcel;
+import com.logpm.basicdata.service.IBasicShopService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 基础门店表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicShop")
+@Api(value = "基础门店表", tags = "基础门店表接口")
+public class BasicShopController extends BladeController {
+
+	private final IBasicShopService basicShopService;
+
+	/**
+	 * 基础门店表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicShop")
+	public R<BasicShopEntity> detail(BasicShopEntity basicShop) {
+		BasicShopEntity detail = basicShopService.getOne(Condition.getQueryWrapper(basicShop));
+		return R.data(detail);
+	}
+	/**
+	 * 基础门店表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicShop")
+	public R<IPage<BasicShopEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicShop, Query query) {
+		IPage<BasicShopEntity> pages = basicShopService.page(Condition.getPage(query), Condition.getQueryWrapper(basicShop, BasicShopEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础门店表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicShop")
+	public R<IPage<BasicShopVO>> page(BasicShopVO basicShop, Query query) {
+		IPage<BasicShopVO> pages = basicShopService.selectBasicShopPage(Condition.getPage(query), basicShop);
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础门店表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicShop")
+	public R save(@Valid @RequestBody BasicShopEntity basicShop) {
+		return R.status(basicShopService.save(basicShop));
+	}
+
+	/**
+	 * 基础门店表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicShop")
+	public R update(@Valid @RequestBody BasicShopEntity basicShop) {
+		return R.status(basicShopService.updateById(basicShop));
+	}
+
+	/**
+	 * 基础门店表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicShop")
+	public R submit(@Valid @RequestBody BasicShopEntity basicShop) {
+		return R.status(basicShopService.saveOrUpdate(basicShop));
+	}
+
+	/**
+	 * 基础门店表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicShopService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicShop")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicShop")
+	public void exportBasicShop(@ApiIgnore @RequestParam Map<String, Object> basicShop, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicShopEntity> queryWrapper = Condition.getQueryWrapper(basicShop, BasicShopEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicShop::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicShopEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicShopExcel> list = basicShopService.exportBasicShop(queryWrapper);
+		ExcelUtil.export(response, "基础门店表数据" + DateUtil.time(), "基础门店表数据表", list, BasicShopExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStorageServicesController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import com.logpm.basicdata.vo.BasicStorageServicesVO;
+import com.logpm.basicdata.excel.BasicStorageServicesExcel;
+import com.logpm.basicdata.service.IBasicStorageServicesService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 门店服务仓库表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicStorageServices")
+@Api(value = "门店服务仓库表", tags = "门店服务仓库表接口")
+public class BasicStorageServicesController extends BladeController {
+
+	private final IBasicStorageServicesService basicStorageServicesService;
+
+	/**
+	 * 门店服务仓库表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicStorageServices")
+	public R<BasicStorageServicesEntity> detail(BasicStorageServicesEntity basicStorageServices) {
+		BasicStorageServicesEntity detail = basicStorageServicesService.getOne(Condition.getQueryWrapper(basicStorageServices));
+		return R.data(detail);
+	}
+	/**
+	 * 门店服务仓库表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicStorageServices")
+	public R<IPage<BasicStorageServicesEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicStorageServices, Query query) {
+		IPage<BasicStorageServicesEntity> pages = basicStorageServicesService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStorageServices, BasicStorageServicesEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 门店服务仓库表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicStorageServices")
+	public R<IPage<BasicStorageServicesVO>> page(BasicStorageServicesVO basicStorageServices, Query query) {
+		IPage<BasicStorageServicesVO> pages = basicStorageServicesService.selectBasicStorageServicesPage(Condition.getPage(query), basicStorageServices);
+		return R.data(pages);
+	}
+
+	/**
+	 * 门店服务仓库表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicStorageServices")
+	public R save(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
+		return R.status(basicStorageServicesService.save(basicStorageServices));
+	}
+
+	/**
+	 * 门店服务仓库表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicStorageServices")
+	public R update(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
+		return R.status(basicStorageServicesService.updateById(basicStorageServices));
+	}
+
+	/**
+	 * 门店服务仓库表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicStorageServices")
+	public R submit(@Valid @RequestBody BasicStorageServicesEntity basicStorageServices) {
+		return R.status(basicStorageServicesService.saveOrUpdate(basicStorageServices));
+	}
+
+	/**
+	 * 门店服务仓库表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicStorageServicesService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicStorageServices")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicStorageServices")
+	public void exportBasicStorageServices(@ApiIgnore @RequestParam Map<String, Object> basicStorageServices, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicStorageServicesEntity> queryWrapper = Condition.getQueryWrapper(basicStorageServices, BasicStorageServicesEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicStorageServices::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicStorageServicesEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicStorageServicesExcel> list = basicStorageServicesService.exportBasicStorageServices(queryWrapper);
+		ExcelUtil.export(response, "门店服务仓库表数据" + DateUtil.time(), "门店服务仓库表数据表", list, BasicStorageServicesExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStoreBrandController.java

@@ -0,0 +1,151 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.vo.BasicStoreBrandVO;
+import com.logpm.basicdata.excel.BasicStoreBrandExcel;
+import com.logpm.basicdata.wrapper.BasicStoreBrandWrapper;
+import com.logpm.basicdata.service.IBasicStoreBrandService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 门店品牌中间表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicStoreBrand")
+@Api(value = "门店品牌中间表", tags = "门店品牌中间表接口")
+public class BasicStoreBrandController extends BladeController {
+
+	private final IBasicStoreBrandService basicStoreBrandService;
+
+	/**
+	 * 门店品牌中间表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicStoreBrand")
+	public R<BasicStoreBrandVO> detail(BasicStoreBrandEntity basicStoreBrand) {
+		BasicStoreBrandEntity detail = basicStoreBrandService.getOne(Condition.getQueryWrapper(basicStoreBrand));
+		return R.data(BasicStoreBrandWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 门店品牌中间表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicStoreBrand")
+	public R<IPage<BasicStoreBrandVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicStoreBrand, Query query) {
+		IPage<BasicStoreBrandEntity> pages = basicStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStoreBrand, BasicStoreBrandEntity.class));
+		return R.data(BasicStoreBrandWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 门店品牌中间表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicStoreBrand")
+	public R<IPage<BasicStoreBrandVO>> page(BasicStoreBrandVO basicStoreBrand, Query query) {
+		IPage<BasicStoreBrandVO> pages = basicStoreBrandService.selectBasicStoreBrandPage(Condition.getPage(query), basicStoreBrand);
+		return R.data(pages);
+	}
+
+	/**
+	 * 门店品牌中间表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicStoreBrand")
+	public R save(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
+		return R.status(basicStoreBrandService.save(basicStoreBrand));
+	}
+
+	/**
+	 * 门店品牌中间表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicStoreBrand")
+	public R update(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
+		return R.status(basicStoreBrandService.updateById(basicStoreBrand));
+	}
+
+	/**
+	 * 门店品牌中间表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicStoreBrand")
+	public R submit(@Valid @RequestBody BasicStoreBrandEntity basicStoreBrand) {
+		return R.status(basicStoreBrandService.saveOrUpdate(basicStoreBrand));
+	}
+
+	/**
+	 * 门店品牌中间表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicStoreBrandService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicStoreBrand")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicStoreBrand")
+	public void exportBasicStoreBrand(@ApiIgnore @RequestParam Map<String, Object> basicStoreBrand, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicStoreBrandEntity> queryWrapper = Condition.getQueryWrapper(basicStoreBrand, BasicStoreBrandEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicStoreBrand::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicStoreBrandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicStoreBrandExcel> list = basicStoreBrandService.exportBasicStoreBrand(queryWrapper);
+		ExcelUtil.export(response, "门店品牌中间表数据" + DateUtil.time(), "门店品牌中间表数据表", list, BasicStoreBrandExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicStoreContactController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import com.logpm.basicdata.vo.BasicStoreContactVO;
+import com.logpm.basicdata.excel.BasicStoreContactExcel;
+import com.logpm.basicdata.service.IBasicStoreContactService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 基础门店联系人表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicStoreContact")
+@Api(value = "基础门店联系人表", tags = "基础门店联系人表接口")
+public class BasicStoreContactController extends BladeController {
+
+	private final IBasicStoreContactService basicStoreContactService;
+
+	/**
+	 * 基础门店联系人表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicStoreContact")
+	public R<BasicStoreContactEntity> detail(BasicStoreContactEntity basicStoreContact) {
+		BasicStoreContactEntity detail = basicStoreContactService.getOne(Condition.getQueryWrapper(basicStoreContact));
+		return R.data(detail);
+	}
+	/**
+	 * 基础门店联系人表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicStoreContact")
+	public R<IPage<BasicStoreContactEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicStoreContact, Query query) {
+		IPage<BasicStoreContactEntity> pages = basicStoreContactService.page(Condition.getPage(query), Condition.getQueryWrapper(basicStoreContact, BasicStoreContactEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础门店联系人表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicStoreContact")
+	public R<IPage<BasicStoreContactVO>> page(BasicStoreContactVO basicStoreContact, Query query) {
+		IPage<BasicStoreContactVO> pages = basicStoreContactService.selectBasicStoreContactPage(Condition.getPage(query), basicStoreContact);
+		return R.data(pages);
+	}
+
+	/**
+	 * 基础门店联系人表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicStoreContact")
+	public R save(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
+		return R.status(basicStoreContactService.save(basicStoreContact));
+	}
+
+	/**
+	 * 基础门店联系人表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicStoreContact")
+	public R update(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
+		return R.status(basicStoreContactService.updateById(basicStoreContact));
+	}
+
+	/**
+	 * 基础门店联系人表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicStoreContact")
+	public R submit(@Valid @RequestBody BasicStoreContactEntity basicStoreContact) {
+		return R.status(basicStoreContactService.saveOrUpdate(basicStoreContact));
+	}
+
+	/**
+	 * 基础门店联系人表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicStoreContactService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicStoreContact")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicStoreContact")
+	public void exportBasicStoreContact(@ApiIgnore @RequestParam Map<String, Object> basicStoreContact, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicStoreContactEntity> queryWrapper = Condition.getQueryWrapper(basicStoreContact, BasicStoreContactEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicStoreContact::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicStoreContactEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicStoreContactExcel> list = basicStoreContactService.exportBasicStoreContact(queryWrapper);
+		ExcelUtil.export(response, "基础门店联系人表数据" + DateUtil.time(), "基础门店联系人表数据表", list, BasicStoreContactExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicZonePriceController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import com.logpm.basicdata.vo.BasicZonePriceVO;
+import com.logpm.basicdata.excel.BasicZonePriceExcel;
+import com.logpm.basicdata.service.IBasicZonePriceService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 区域品牌价格表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicZonePrice")
+@Api(value = "区域品牌价格表", tags = "区域品牌价格表接口")
+public class BasicZonePriceController extends BladeController {
+
+	private final IBasicZonePriceService basicZonePriceService;
+
+	/**
+	 * 区域品牌价格表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicZonePrice")
+	public R<BasicZonePriceEntity> detail(BasicZonePriceEntity basicZonePrice) {
+		BasicZonePriceEntity detail = basicZonePriceService.getOne(Condition.getQueryWrapper(basicZonePrice));
+		return R.data(detail);
+	}
+	/**
+	 * 区域品牌价格表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicZonePrice")
+	public R<IPage<BasicZonePriceEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicZonePrice, Query query) {
+		IPage<BasicZonePriceEntity> pages = basicZonePriceService.page(Condition.getPage(query), Condition.getQueryWrapper(basicZonePrice, BasicZonePriceEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 区域品牌价格表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicZonePrice")
+	public R<IPage<BasicZonePriceVO>> page(BasicZonePriceVO basicZonePrice, Query query) {
+		IPage<BasicZonePriceVO> pages = basicZonePriceService.selectBasicZonePricePage(Condition.getPage(query), basicZonePrice);
+		return R.data(pages);
+	}
+
+	/**
+	 * 区域品牌价格表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicZonePrice")
+	public R save(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
+		return R.status(basicZonePriceService.save(basicZonePrice));
+	}
+
+	/**
+	 * 区域品牌价格表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicZonePrice")
+	public R update(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
+		return R.status(basicZonePriceService.updateById(basicZonePrice));
+	}
+
+	/**
+	 * 区域品牌价格表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicZonePrice")
+	public R submit(@Valid @RequestBody BasicZonePriceEntity basicZonePrice) {
+		return R.status(basicZonePriceService.saveOrUpdate(basicZonePrice));
+	}
+
+	/**
+	 * 区域品牌价格表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicZonePriceService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicZonePrice")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicZonePrice")
+	public void exportBasicZonePrice(@ApiIgnore @RequestParam Map<String, Object> basicZonePrice, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicZonePriceEntity> queryWrapper = Condition.getQueryWrapper(basicZonePrice, BasicZonePriceEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicZonePrice::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicZonePriceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicZonePriceExcel> list = basicZonePriceService.exportBasicZonePrice(queryWrapper);
+		ExcelUtil.export(response, "区域品牌价格表数据" + DateUtil.time(), "区域品牌价格表数据表", list, BasicZonePriceExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicBrandDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础品牌表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicBrandDTO extends BasicBrandEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicClientDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicClientEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础客户表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicClientDTO extends BasicClientEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicFreightDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础价格记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicFreightDTO extends BasicFreightEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicHistoricalContractDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户历史合同记录 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicHistoricalContractDTO extends BasicHistoricalContractEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicShopDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicShopEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础门店表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicShopDTO extends BasicShopEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStorageServicesDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 门店服务仓库表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStorageServicesDTO extends BasicStorageServicesEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStoreBrandDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 门店品牌中间表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreBrandDTO extends BasicStoreBrandEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicStoreContactDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基础门店联系人表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicStoreContactDTO extends BasicStoreContactEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicZonePriceDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 区域品牌价格表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicZonePriceDTO extends BasicZonePriceEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicBrandExcel.java

@@ -0,0 +1,111 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 基础品牌表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicBrandExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 品牌名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌名称")
+	private String brandName;
+	/**
+	 * 品牌编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌编号")
+	private String brandCode;
+	/**
+	 * 品牌图标
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌图标")
+	private String brandIcon;
+	/**
+	 * 承接时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("承接时间")
+	private Date acceptanceTime;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicClientExcel.java

@@ -0,0 +1,135 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 基础客户表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicClientExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 客户名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户名称")
+	private String clientName;
+	/**
+	 * 客户类型;1 C端  2 B端
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户类型;1 C端  2 B端")
+	private Integer typeService;
+	/**
+	 * 省份
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("省份")
+	private String bladeRegionProvinceId;
+	/**
+	 * 市
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("市")
+	private String bladeRegionCityId;
+	/**
+	 * 区/县
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区/县")
+	private String bladeRegionAreaId;
+	/**
+	 * 合同附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同附件")
+	private String leaseAccessories;
+	/**
+	 * 合同开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同开始时间")
+	private Date contractStartTime;
+	/**
+	 * 合同结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同结束时间")
+	private Date contractEntTime;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicFreightExcel.java

@@ -0,0 +1,238 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 基础价格记录表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicFreightExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 计算方式;1件  2方  3公斤
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("计算方式;1件  2方  3公斤")
+	private Integer formulaMode;
+	/**
+	 * 物品名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物品名称")
+	private String itemName;
+	/**
+	 * 门店品牌记录表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店品牌记录表")
+	private String storeBrandId;
+	/**
+	 * 运费
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运费")
+	private BigDecimal freight;
+	/**
+	 * 送货费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("送货费用")
+	private BigDecimal deliveryExpense;
+	/**
+	 * 提货费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("提货费用")
+	private BigDecimal deliveryCharge;
+	/**
+	 * 仓库管理费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓库管理费用")
+	private BigDecimal warehouseOverhead;
+	/**
+	 * 仓储费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓储费用")
+	private BigDecimal storageCharge;
+	/**
+	 * 装卸费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装卸费用")
+	private BigDecimal terminalCharges;
+	/**
+	 * 其他费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("其他费用")
+	private BigDecimal otherCharges;
+	/**
+	 * 末端仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("末端仓")
+	private String singleColon;
+	/**
+	 * 发货单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发货单位")
+	private String forwardingUnit;
+	/**
+	 * 门店
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店")
+	private String shop;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 服务类型;1 干  2干仓  3干仓配 4干配
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型;1 干  2干仓  3干仓配 4干配")
+	private Integer typeService;
+	/**
+	 * 结算方;1 商场  2工厂
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("结算方;1 商场  2工厂")
+	private Integer clearingForm;
+	/**
+	 * 一级品类
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品类")
+	private String firstClassCategory;
+	/**
+	 * 一口价
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一口价")
+	private BigDecimal fixedPrice;
+	/**
+	 * 干线费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("干线费用")
+	private BigDecimal trunkCharge;
+	/**
+	 * 生效时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("生效时间")
+	private Date effectiveTime;
+	/**
+	 * 截至时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("截至时间")
+	private Date expirationTime;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String type;
+	/**
+	 * 标识
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("标识")
+	private String identification;
+	/**
+	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
+	private Integer warehousingTimeCharge;
+	/**
+	 * 仓储时间端费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓储时间端费用")
+	private BigDecimal warehousingTimeStatus;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicHistoricalContractExcel.java

@@ -0,0 +1,111 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 客户历史合同记录 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicHistoricalContractExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 客户id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户id")
+	private String clientId;
+	/**
+	 * 合同开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同开始时间")
+	private String contractStartTime;
+	/**
+	 * 合同结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同结束时间")
+	private String contractEntTime;
+	/**
+	 * 合同文件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("合同文件")
+	private String leaseAccessories;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicShopExcel.java

@@ -0,0 +1,153 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 基础门店表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicShopExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户ID")
+	private String clientId;
+	/**
+	 * 门店编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店编码")
+	private String storeCode;
+	/**
+	 * 门店名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店名称")
+	private String storeName;
+	/**
+	 * 联系人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系人")
+	private String linkman;
+	/**
+	 * 联系电话
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系电话")
+	private String phone;
+	/**
+	 * 省
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("省")
+	private String bladeRegionProvinceId;
+	/**
+	 * 城市
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("城市")
+	private String bladeRegionCityId;
+	/**
+	 * 区
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区")
+	private String bladeRegionAreaId;
+	/**
+	 * 详细地址
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("详细地址")
+	private String detailedAddress;
+	/**
+	 * 入驻时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入驻时间")
+	private Date checkInTime;
+	/**
+	 * 退出时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("退出时间")
+	private Date postSetTime;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStorageServicesExcel.java

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 门店服务仓库表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicStorageServicesExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店ID")
+	private String shopId;
+	/**
+	 * 发货单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发货单位")
+	private String forwardingUnit;
+	/**
+	 * 服务仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务仓库")
+	private String warehouseService;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreBrandExcel.java

@@ -0,0 +1,99 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 门店品牌中间表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicStoreBrandExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店ID")
+	private String shopId;
+	/**
+	 * 品牌ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌ID")
+	private String brandId;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicStoreContactExcel.java

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 基础门店联系人表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicStoreContactExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 门店ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店ID")
+	private String shopId;
+	/**
+	 * 联系人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系人")
+	private String linkman;
+	/**
+	 * 联系电话
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系电话")
+	private String phone;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicZonePriceExcel.java

@@ -0,0 +1,154 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 区域品牌价格表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicZonePriceExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 省
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("省")
+	private String province;
+	/**
+	 * 市
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("市")
+	private String city;
+	/**
+	 * 区/县
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区/县")
+	private String district;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("费用标识;1 运费 2 送货费用 3提货费用 4仓库管理费用 5 仓储费用 6装卸费用 7 其他费用 8仓储时间端费用")
+	private String freightMark;
+	/**
+	 * 费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("费用")
+	private String cost;
+	/**
+	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
+	private Integer warehousingTimeStatus;
+	/**
+	 * 仓储时间端费用
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓储时间端费用")
+	private BigDecimal warehousingTimeCharge;
+	/**
+	 * 末端仓
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("末端仓")
+	private String goalGranary;
+	/**
+	 * 标识
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("标识")
+	private Integer identification;
+	/**
+	 * 状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("状态")
+	private Integer condition;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicBrandClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import com.logpm.basicdata.service.IBasicBrandService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础品牌表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicBrandClient implements IBasicBrandClient {
+
+    private final IBasicBrandService basicBrandService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicBrandEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicBrandEntity> page = basicBrandService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicClientClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicClientEntity;
+import com.logpm.basicdata.service.IBasicClientService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础客户表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicClientClient implements IBasicClientClient {
+
+    private final IBasicClientService basicClientService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicClientEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicClientEntity> page = basicClientService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicFreightClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import com.logpm.basicdata.service.IBasicFreightService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础价格记录表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicFreightClient implements IBasicFreightClient {
+
+    private final IBasicFreightService basicFreightService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicFreightEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicFreightEntity> page = basicFreightService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicHistoricalContractClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import com.logpm.basicdata.service.IBasicHistoricalContractService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 客户历史合同记录 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicHistoricalContractClient implements IBasicHistoricalContractClient {
+
+    private final IBasicHistoricalContractService basicHistoricalContractService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicHistoricalContractEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicHistoricalContractEntity> page = basicHistoricalContractService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicShopClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicShopEntity;
+import com.logpm.basicdata.service.IBasicShopService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础门店表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicShopClient implements IBasicShopClient {
+
+    private final IBasicShopService basicShopService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicShopEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicShopEntity> page = basicShopService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStorageServicesClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import com.logpm.basicdata.service.IBasicStorageServicesService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 门店服务仓库表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicStorageServicesClient implements IBasicStorageServicesClient {
+
+    private final IBasicStorageServicesService basicStorageServicesService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicStorageServicesEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicStorageServicesEntity> page = basicStorageServicesService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStoreBrandClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.service.IBasicStoreBrandService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础品牌表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicStoreBrandClient implements IBasicStoreBrandClient {
+
+    private final IBasicStoreBrandService basicStoreBrandService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicStoreBrandEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicStoreBrandEntity> page = basicStoreBrandService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicStoreContactClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import com.logpm.basicdata.service.IBasicStoreContactService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础门店联系人表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicStoreContactClient implements IBasicStoreContactClient {
+
+    private final IBasicStoreContactService basicStoreContactService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicStoreContactEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicStoreContactEntity> page = basicStoreContactService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicZonePriceClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import com.logpm.basicdata.service.IBasicZonePriceService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 区域品牌价格表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicZonePriceClient implements IBasicZonePriceClient {
+
+    private final IBasicZonePriceService basicZonePriceService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicZonePriceEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicZonePriceEntity> page = basicZonePriceService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicBrandMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import com.logpm.basicdata.vo.BasicBrandVO;
+import com.logpm.basicdata.excel.BasicBrandExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 基础品牌表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicBrandMapper extends BaseMapper<BasicBrandEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicBrand
+	 * @return
+	 */
+	List<BasicBrandVO> selectBasicBrandPage(IPage page, BasicBrandVO basicBrand);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicBrandExcel> exportBasicBrand(@Param("ew") Wrapper<BasicBrandEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicBrandMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicBrandMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicBrandResultMap" type="com.logpm.basicdata.entity.BasicBrandEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="brand_code" property="brandCode"/>
+        <result column="brand_icon" property="brandIcon"/>
+        <result column="acceptance_time" property="acceptanceTime"/>
+    </resultMap>
+
+
+    <select id="selectBasicBrandPage" resultMap="basicBrandResultMap">
+        select * from logpm_basic_brand where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicBrand" resultType="com.logpm.basicdata.excel.BasicBrandExcel">
+        SELECT * FROM logpm_basic_brand ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicClientMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicClientEntity;
+import com.logpm.basicdata.vo.BasicClientVO;
+import com.logpm.basicdata.excel.BasicClientExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 基础客户表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicClientMapper extends BaseMapper<BasicClientEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicClient
+	 * @return
+	 */
+	List<BasicClientVO> selectBasicClientPage(IPage page, BasicClientVO basicClient);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicClientExcel> exportBasicClient(@Param("ew") Wrapper<BasicClientEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicClientMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicClientMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicClientResultMap" type="com.logpm.basicdata.entity.BasicClientEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="client_name" property="clientName"/>
+        <result column="type_service" property="typeService"/>
+        <result column="blade_region_province_id" property="bladeRegionProvinceId"/>
+        <result column="blade_region_city_id" property="bladeRegionCityId"/>
+        <result column="blade_region_area_id" property="bladeRegionAreaId"/>
+        <result column="lease_accessories" property="leaseAccessories"/>
+        <result column="contract_start_time" property="contractStartTime"/>
+        <result column="contract_ent_time" property="contractEntTime"/>
+    </resultMap>
+
+
+    <select id="selectBasicClientPage" resultMap="basicClientResultMap">
+        select * from logpm_basic_client where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicClient" resultType="com.logpm.basicdata.excel.BasicClientExcel">
+        SELECT * FROM logpm_basic_client ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicFreightMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import com.logpm.basicdata.vo.BasicFreightVO;
+import com.logpm.basicdata.excel.BasicFreightExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 基础价格记录表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicFreightMapper extends BaseMapper<BasicFreightEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicFreight
+	 * @return
+	 */
+	List<BasicFreightVO> selectBasicFreightPage(IPage page, BasicFreightVO basicFreight);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicFreightExcel> exportBasicFreight(@Param("ew") Wrapper<BasicFreightEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicFreightMapper.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicFreightMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicFreightResultMap" type="com.logpm.basicdata.entity.BasicFreightEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="formula_mode" property="formulaMode"/>
+        <result column="item_name" property="itemName"/>
+        <result column="store_brand_id" property="storeBrandId"/>
+        <result column="freight" property="freight"/>
+        <result column="delivery_expense" property="deliveryExpense"/>
+        <result column="delivery_charge" property="deliveryCharge"/>
+        <result column="warehouse_overhead" property="warehouseOverhead"/>
+        <result column="storage_charge" property="storageCharge"/>
+        <result column="terminal_charges" property="terminalCharges"/>
+        <result column="other_charges" property="otherCharges"/>
+        <result column="single_colon" property="singleColon"/>
+        <result column="forwarding_unit" property="forwardingUnit"/>
+        <result column="shop" property="shop"/>
+        <result column="brand" property="brand"/>
+        <result column="type_service" property="typeService"/>
+        <result column="clearing_form" property="clearingForm"/>
+        <result column="first_class_category" property="firstClassCategory"/>
+        <result column="fixed_price" property="fixedPrice"/>
+        <result column="trunk_charge" property="trunkCharge"/>
+        <result column="effective_time" property="effectiveTime"/>
+        <result column="expiration_time" property="expirationTime"/>
+        <result column="type" property="type"/>
+        <result column="identification" property="identification"/>
+        <result column="warehousing_time_charge" property="warehousingTimeCharge"/>
+        <result column="warehousing_time_status" property="warehousingTimeStatus"/>
+    </resultMap>
+
+
+    <select id="selectBasicFreightPage" resultMap="basicFreightResultMap">
+        select * from logpm_basic_freight where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicFreight" resultType="com.logpm.basicdata.excel.BasicFreightExcel">
+        SELECT * FROM logpm_basic_freight ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicHistoricalContractMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import com.logpm.basicdata.vo.BasicHistoricalContractVO;
+import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 客户历史合同记录 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicHistoricalContractMapper extends BaseMapper<BasicHistoricalContractEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicHistoricalContract
+	 * @return
+	 */
+	List<BasicHistoricalContractVO> selectBasicHistoricalContractPage(IPage page, BasicHistoricalContractVO basicHistoricalContract);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicHistoricalContractExcel> exportBasicHistoricalContract(@Param("ew") Wrapper<BasicHistoricalContractEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicHistoricalContractMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicHistoricalContractMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicHistoricalContractResultMap" type="com.logpm.basicdata.entity.BasicHistoricalContractEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="client_id" property="clientId"/>
+        <result column="contract_start_time" property="contractStartTime"/>
+        <result column="contract_ent_time" property="contractEntTime"/>
+        <result column="lease_accessories" property="leaseAccessories"/>
+    </resultMap>
+
+
+    <select id="selectBasicHistoricalContractPage" resultMap="basicHistoricalContractResultMap">
+        select * from logpm_basic_historical_contract where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicHistoricalContract" resultType="com.logpm.basicdata.excel.BasicHistoricalContractExcel">
+        SELECT * FROM logpm_basic_historical_contract ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicShopMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicShopEntity;
+import com.logpm.basicdata.vo.BasicShopVO;
+import com.logpm.basicdata.excel.BasicShopExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 基础门店表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicShopMapper extends BaseMapper<BasicShopEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicShop
+	 * @return
+	 */
+	List<BasicShopVO> selectBasicShopPage(IPage page, BasicShopVO basicShop);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicShopExcel> exportBasicShop(@Param("ew") Wrapper<BasicShopEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicShopMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicShopMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicShopResultMap" type="com.logpm.basicdata.entity.BasicShopEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="client_id" property="clientId"/>
+        <result column="store_code" property="storeCode"/>
+        <result column="store_name" property="storeName"/>
+        <result column="linkman" property="linkman"/>
+        <result column="phone" property="phone"/>
+        <result column="blade_region_province_id" property="bladeRegionProvinceId"/>
+        <result column="blade_region_city_id" property="bladeRegionCityId"/>
+        <result column="blade_region_area_id" property="bladeRegionAreaId"/>
+        <result column="detailed_address" property="detailedAddress"/>
+        <result column="check_in_time" property="checkInTime"/>
+        <result column="post_set_time" property="postSetTime"/>
+    </resultMap>
+
+
+    <select id="selectBasicShopPage" resultMap="basicShopResultMap">
+        select * from logpm_basic_shop where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicShop" resultType="com.logpm.basicdata.excel.BasicShopExcel">
+        SELECT * FROM logpm_basic_shop ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStorageServicesMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import com.logpm.basicdata.vo.BasicStorageServicesVO;
+import com.logpm.basicdata.excel.BasicStorageServicesExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 门店服务仓库表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicStorageServicesMapper extends BaseMapper<BasicStorageServicesEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStorageServices
+	 * @return
+	 */
+	List<BasicStorageServicesVO> selectBasicStorageServicesPage(IPage page, BasicStorageServicesVO basicStorageServices);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStorageServicesExcel> exportBasicStorageServices(@Param("ew") Wrapper<BasicStorageServicesEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStorageServicesMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicStorageServicesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicStorageServicesResultMap" type="com.logpm.basicdata.entity.BasicStorageServicesEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="shop_id" property="shopId"/>
+        <result column="forwarding_unit" property="forwardingUnit"/>
+        <result column="warehouse_service" property="warehouseService"/>
+    </resultMap>
+
+
+    <select id="selectBasicStorageServicesPage" resultMap="basicStorageServicesResultMap">
+        select * from logpm_basic_storage_services where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicStorageServices" resultType="com.logpm.basicdata.excel.BasicStorageServicesExcel">
+        SELECT * FROM logpm_basic_storage_services ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreBrandMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.vo.BasicStoreBrandVO;
+import com.logpm.basicdata.excel.BasicStoreBrandExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 门店品牌中间表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicStoreBrandMapper extends BaseMapper<BasicStoreBrandEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStoreBrand
+	 * @return
+	 */
+	List<BasicStoreBrandVO> selectBasicStoreBrandPage(IPage page, BasicStoreBrandVO basicStoreBrand);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStoreBrandExcel> exportBasicStoreBrand(@Param("ew") Wrapper<BasicStoreBrandEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreBrandMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicStoreBrandMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicStoreBrandResultMap" type="com.logpm.basicdata.entity.BasicStoreBrandEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="shop_id" property="shopId"/>
+        <result column="brand_id" property="brandId"/>
+    </resultMap>
+
+
+    <select id="selectBasicStoreBrandPage" resultMap="basicStoreBrandResultMap">
+        select * from logpm_basic_store_brand where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicStoreBrand" resultType="com.logpm.basicdata.excel.BasicStoreBrandExcel">
+        SELECT * FROM logpm_basic_store_brand ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreContactMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import com.logpm.basicdata.vo.BasicStoreContactVO;
+import com.logpm.basicdata.excel.BasicStoreContactExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 基础门店联系人表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicStoreContactMapper extends BaseMapper<BasicStoreContactEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStoreContact
+	 * @return
+	 */
+	List<BasicStoreContactVO> selectBasicStoreContactPage(IPage page, BasicStoreContactVO basicStoreContact);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStoreContactExcel> exportBasicStoreContact(@Param("ew") Wrapper<BasicStoreContactEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicStoreContactMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicStoreContactMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicStoreContactResultMap" type="com.logpm.basicdata.entity.BasicStoreContactEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="shop_id" property="shopId"/>
+        <result column="linkman" property="linkman"/>
+        <result column="phone" property="phone"/>
+    </resultMap>
+
+
+    <select id="selectBasicStoreContactPage" resultMap="basicStoreContactResultMap">
+        select * from logpm_basic_store_contact where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicStoreContact" resultType="com.logpm.basicdata.excel.BasicStoreContactExcel">
+        SELECT * FROM logpm_basic_store_contact ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicZonePriceMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import com.logpm.basicdata.vo.BasicZonePriceVO;
+import com.logpm.basicdata.excel.BasicZonePriceExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 区域品牌价格表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface BasicZonePriceMapper extends BaseMapper<BasicZonePriceEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicZonePrice
+	 * @return
+	 */
+	List<BasicZonePriceVO> selectBasicZonePricePage(IPage page, BasicZonePriceVO basicZonePrice);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicZonePriceExcel> exportBasicZonePrice(@Param("ew") Wrapper<BasicZonePriceEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicZonePriceMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicZonePriceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicZonePriceResultMap" type="com.logpm.basicdata.entity.BasicZonePriceEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="province" property="province"/>
+        <result column="city" property="city"/>
+        <result column="district" property="district"/>
+        <result column="brand" property="brand"/>
+        <result column="freight_mark" property="freightMark"/>
+        <result column="cost" property="cost"/>
+        <result column="warehousing_time_status" property="warehousingTimeStatus"/>
+        <result column="warehousing_time_charge" property="warehousingTimeCharge"/>
+        <result column="goal_granary" property="goalGranary"/>
+        <result column="identification" property="identification"/>
+        <result column="condition" property="condition"/>
+    </resultMap>
+
+
+    <select id="selectBasicZonePricePage" resultMap="basicZonePriceResultMap">
+        select * from logpm_basic_zone_price where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicZonePrice" resultType="com.logpm.basicdata.excel.BasicZonePriceExcel">
+        SELECT * FROM logpm_basic_zone_price ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicBrandService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import com.logpm.basicdata.vo.BasicBrandVO;
+import com.logpm.basicdata.excel.BasicBrandExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 基础品牌表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicBrandService extends BaseService<BasicBrandEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicBrand
+	 * @return
+	 */
+	IPage<BasicBrandVO> selectBasicBrandPage(IPage<BasicBrandVO> page, BasicBrandVO basicBrand);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicBrandExcel> exportBasicBrand(Wrapper<BasicBrandEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicClientService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicClientEntity;
+import com.logpm.basicdata.vo.BasicClientVO;
+import com.logpm.basicdata.excel.BasicClientExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 基础客户表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicClientService extends BaseService<BasicClientEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicClient
+	 * @return
+	 */
+	IPage<BasicClientVO> selectBasicClientPage(IPage<BasicClientVO> page, BasicClientVO basicClient);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicClientExcel> exportBasicClient(Wrapper<BasicClientEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicFreightService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import com.logpm.basicdata.vo.BasicFreightVO;
+import com.logpm.basicdata.excel.BasicFreightExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 基础价格记录表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicFreightService extends BaseService<BasicFreightEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicFreight
+	 * @return
+	 */
+	IPage<BasicFreightVO> selectBasicFreightPage(IPage<BasicFreightVO> page, BasicFreightVO basicFreight);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicFreightExcel> exportBasicFreight(Wrapper<BasicFreightEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicHistoricalContractService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import com.logpm.basicdata.vo.BasicHistoricalContractVO;
+import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 客户历史合同记录 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicHistoricalContractService extends BaseService<BasicHistoricalContractEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicHistoricalContract
+	 * @return
+	 */
+	IPage<BasicHistoricalContractVO> selectBasicHistoricalContractPage(IPage<BasicHistoricalContractVO> page, BasicHistoricalContractVO basicHistoricalContract);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicHistoricalContractExcel> exportBasicHistoricalContract(Wrapper<BasicHistoricalContractEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicShopService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicShopEntity;
+import com.logpm.basicdata.vo.BasicShopVO;
+import com.logpm.basicdata.excel.BasicShopExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 基础门店表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicShopService extends BaseService<BasicShopEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicShop
+	 * @return
+	 */
+	IPage<BasicShopVO> selectBasicShopPage(IPage<BasicShopVO> page, BasicShopVO basicShop);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicShopExcel> exportBasicShop(Wrapper<BasicShopEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicStorageServicesService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import com.logpm.basicdata.vo.BasicStorageServicesVO;
+import com.logpm.basicdata.excel.BasicStorageServicesExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 门店服务仓库表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicStorageServicesService extends BaseService<BasicStorageServicesEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStorageServices
+	 * @return
+	 */
+	IPage<BasicStorageServicesVO> selectBasicStorageServicesPage(IPage<BasicStorageServicesVO> page, BasicStorageServicesVO basicStorageServices);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStorageServicesExcel> exportBasicStorageServices(Wrapper<BasicStorageServicesEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicStoreBrandService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.vo.BasicStoreBrandVO;
+import com.logpm.basicdata.excel.BasicStoreBrandExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 门店品牌中间表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicStoreBrandService extends BaseService<BasicStoreBrandEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStoreBrand
+	 * @return
+	 */
+	IPage<BasicStoreBrandVO> selectBasicStoreBrandPage(IPage<BasicStoreBrandVO> page, BasicStoreBrandVO basicStoreBrand);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStoreBrandExcel> exportBasicStoreBrand(Wrapper<BasicStoreBrandEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicStoreContactService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import com.logpm.basicdata.vo.BasicStoreContactVO;
+import com.logpm.basicdata.excel.BasicStoreContactExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 基础门店联系人表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicStoreContactService extends BaseService<BasicStoreContactEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicStoreContact
+	 * @return
+	 */
+	IPage<BasicStoreContactVO> selectBasicStoreContactPage(IPage<BasicStoreContactVO> page, BasicStoreContactVO basicStoreContact);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicStoreContactExcel> exportBasicStoreContact(Wrapper<BasicStoreContactEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicZonePriceService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import com.logpm.basicdata.vo.BasicZonePriceVO;
+import com.logpm.basicdata.excel.BasicZonePriceExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 区域品牌价格表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public interface IBasicZonePriceService extends BaseService<BasicZonePriceEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicZonePrice
+	 * @return
+	 */
+	IPage<BasicZonePriceVO> selectBasicZonePricePage(IPage<BasicZonePriceVO> page, BasicZonePriceVO basicZonePrice);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicZonePriceExcel> exportBasicZonePrice(Wrapper<BasicZonePriceEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicBrandServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicBrandEntity;
+import com.logpm.basicdata.vo.BasicBrandVO;
+import com.logpm.basicdata.excel.BasicBrandExcel;
+import com.logpm.basicdata.mapper.BasicBrandMapper;
+import com.logpm.basicdata.service.IBasicBrandService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 基础品牌表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicBrandServiceImpl extends BaseServiceImpl<BasicBrandMapper, BasicBrandEntity> implements IBasicBrandService {
+
+	@Override
+	public IPage<BasicBrandVO> selectBasicBrandPage(IPage<BasicBrandVO> page, BasicBrandVO basicBrand) {
+		return page.setRecords(baseMapper.selectBasicBrandPage(page, basicBrand));
+	}
+
+
+	@Override
+	public List<BasicBrandExcel> exportBasicBrand(Wrapper<BasicBrandEntity> queryWrapper) {
+		List<BasicBrandExcel> basicBrandList = baseMapper.exportBasicBrand(queryWrapper);
+		//basicBrandList.forEach(basicBrand -> {
+		//	basicBrand.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicBrand.getType()));
+		//});
+		return basicBrandList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicClientServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicClientEntity;
+import com.logpm.basicdata.vo.BasicClientVO;
+import com.logpm.basicdata.excel.BasicClientExcel;
+import com.logpm.basicdata.mapper.BasicClientMapper;
+import com.logpm.basicdata.service.IBasicClientService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 基础客户表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicClientServiceImpl extends BaseServiceImpl<BasicClientMapper, BasicClientEntity> implements IBasicClientService {
+
+	@Override
+	public IPage<BasicClientVO> selectBasicClientPage(IPage<BasicClientVO> page, BasicClientVO basicClient) {
+		return page.setRecords(baseMapper.selectBasicClientPage(page, basicClient));
+	}
+
+
+	@Override
+	public List<BasicClientExcel> exportBasicClient(Wrapper<BasicClientEntity> queryWrapper) {
+		List<BasicClientExcel> basicClientList = baseMapper.exportBasicClient(queryWrapper);
+		//basicClientList.forEach(basicClient -> {
+		//	basicClient.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicClient.getType()));
+		//});
+		return basicClientList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicFreightServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicFreightEntity;
+import com.logpm.basicdata.vo.BasicFreightVO;
+import com.logpm.basicdata.excel.BasicFreightExcel;
+import com.logpm.basicdata.mapper.BasicFreightMapper;
+import com.logpm.basicdata.service.IBasicFreightService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 基础价格记录表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicFreightServiceImpl extends BaseServiceImpl<BasicFreightMapper, BasicFreightEntity> implements IBasicFreightService {
+
+	@Override
+	public IPage<BasicFreightVO> selectBasicFreightPage(IPage<BasicFreightVO> page, BasicFreightVO basicFreight) {
+		return page.setRecords(baseMapper.selectBasicFreightPage(page, basicFreight));
+	}
+
+
+	@Override
+	public List<BasicFreightExcel> exportBasicFreight(Wrapper<BasicFreightEntity> queryWrapper) {
+		List<BasicFreightExcel> basicFreightList = baseMapper.exportBasicFreight(queryWrapper);
+		//basicFreightList.forEach(basicFreight -> {
+		//	basicFreight.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicFreight.getType()));
+		//});
+		return basicFreightList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicHistoricalContractServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicHistoricalContractEntity;
+import com.logpm.basicdata.vo.BasicHistoricalContractVO;
+import com.logpm.basicdata.excel.BasicHistoricalContractExcel;
+import com.logpm.basicdata.mapper.BasicHistoricalContractMapper;
+import com.logpm.basicdata.service.IBasicHistoricalContractService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 客户历史合同记录 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicHistoricalContractServiceImpl extends BaseServiceImpl<BasicHistoricalContractMapper, BasicHistoricalContractEntity> implements IBasicHistoricalContractService {
+
+	@Override
+	public IPage<BasicHistoricalContractVO> selectBasicHistoricalContractPage(IPage<BasicHistoricalContractVO> page, BasicHistoricalContractVO basicHistoricalContract) {
+		return page.setRecords(baseMapper.selectBasicHistoricalContractPage(page, basicHistoricalContract));
+	}
+
+
+	@Override
+	public List<BasicHistoricalContractExcel> exportBasicHistoricalContract(Wrapper<BasicHistoricalContractEntity> queryWrapper) {
+		List<BasicHistoricalContractExcel> basicHistoricalContractList = baseMapper.exportBasicHistoricalContract(queryWrapper);
+		//basicHistoricalContractList.forEach(basicHistoricalContract -> {
+		//	basicHistoricalContract.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicHistoricalContract.getType()));
+		//});
+		return basicHistoricalContractList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicShopServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicShopEntity;
+import com.logpm.basicdata.vo.BasicShopVO;
+import com.logpm.basicdata.excel.BasicShopExcel;
+import com.logpm.basicdata.mapper.BasicShopMapper;
+import com.logpm.basicdata.service.IBasicShopService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 基础门店表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicShopServiceImpl extends BaseServiceImpl<BasicShopMapper, BasicShopEntity> implements IBasicShopService {
+
+	@Override
+	public IPage<BasicShopVO> selectBasicShopPage(IPage<BasicShopVO> page, BasicShopVO basicShop) {
+		return page.setRecords(baseMapper.selectBasicShopPage(page, basicShop));
+	}
+
+
+	@Override
+	public List<BasicShopExcel> exportBasicShop(Wrapper<BasicShopEntity> queryWrapper) {
+		List<BasicShopExcel> basicShopList = baseMapper.exportBasicShop(queryWrapper);
+		//basicShopList.forEach(basicShop -> {
+		//	basicShop.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicShop.getType()));
+		//});
+		return basicShopList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicStorageServicesServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicStorageServicesEntity;
+import com.logpm.basicdata.vo.BasicStorageServicesVO;
+import com.logpm.basicdata.excel.BasicStorageServicesExcel;
+import com.logpm.basicdata.mapper.BasicStorageServicesMapper;
+import com.logpm.basicdata.service.IBasicStorageServicesService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 门店服务仓库表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicStorageServicesServiceImpl extends BaseServiceImpl<BasicStorageServicesMapper, BasicStorageServicesEntity> implements IBasicStorageServicesService {
+
+	@Override
+	public IPage<BasicStorageServicesVO> selectBasicStorageServicesPage(IPage<BasicStorageServicesVO> page, BasicStorageServicesVO basicStorageServices) {
+		return page.setRecords(baseMapper.selectBasicStorageServicesPage(page, basicStorageServices));
+	}
+
+
+	@Override
+	public List<BasicStorageServicesExcel> exportBasicStorageServices(Wrapper<BasicStorageServicesEntity> queryWrapper) {
+		List<BasicStorageServicesExcel> basicStorageServicesList = baseMapper.exportBasicStorageServices(queryWrapper);
+		//basicStorageServicesList.forEach(basicStorageServices -> {
+		//	basicStorageServices.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicStorageServices.getType()));
+		//});
+		return basicStorageServicesList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicStoreBrandServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.vo.BasicStoreBrandVO;
+import com.logpm.basicdata.excel.BasicStoreBrandExcel;
+import com.logpm.basicdata.mapper.BasicStoreBrandMapper;
+import com.logpm.basicdata.service.IBasicStoreBrandService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 门店品牌中间表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicStoreBrandServiceImpl extends BaseServiceImpl<BasicStoreBrandMapper, BasicStoreBrandEntity> implements IBasicStoreBrandService {
+
+	@Override
+	public IPage<BasicStoreBrandVO> selectBasicStoreBrandPage(IPage<BasicStoreBrandVO> page, BasicStoreBrandVO basicStoreBrand) {
+		return page.setRecords(baseMapper.selectBasicStoreBrandPage(page, basicStoreBrand));
+	}
+
+
+	@Override
+	public List<BasicStoreBrandExcel> exportBasicStoreBrand(Wrapper<BasicStoreBrandEntity> queryWrapper) {
+		List<BasicStoreBrandExcel> basicStoreBrandList = baseMapper.exportBasicStoreBrand(queryWrapper);
+		//basicStoreBrandList.forEach(basicStoreBrand -> {
+		//	basicStoreBrand.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicStoreBrand.getType()));
+		//});
+		return basicStoreBrandList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicStoreContactServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicStoreContactEntity;
+import com.logpm.basicdata.vo.BasicStoreContactVO;
+import com.logpm.basicdata.excel.BasicStoreContactExcel;
+import com.logpm.basicdata.mapper.BasicStoreContactMapper;
+import com.logpm.basicdata.service.IBasicStoreContactService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 基础门店联系人表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicStoreContactServiceImpl extends BaseServiceImpl<BasicStoreContactMapper, BasicStoreContactEntity> implements IBasicStoreContactService {
+
+	@Override
+	public IPage<BasicStoreContactVO> selectBasicStoreContactPage(IPage<BasicStoreContactVO> page, BasicStoreContactVO basicStoreContact) {
+		return page.setRecords(baseMapper.selectBasicStoreContactPage(page, basicStoreContact));
+	}
+
+
+	@Override
+	public List<BasicStoreContactExcel> exportBasicStoreContact(Wrapper<BasicStoreContactEntity> queryWrapper) {
+		List<BasicStoreContactExcel> basicStoreContactList = baseMapper.exportBasicStoreContact(queryWrapper);
+		//basicStoreContactList.forEach(basicStoreContact -> {
+		//	basicStoreContact.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicStoreContact.getType()));
+		//});
+		return basicStoreContactList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicZonePriceServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicZonePriceEntity;
+import com.logpm.basicdata.vo.BasicZonePriceVO;
+import com.logpm.basicdata.excel.BasicZonePriceExcel;
+import com.logpm.basicdata.mapper.BasicZonePriceMapper;
+import com.logpm.basicdata.service.IBasicZonePriceService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 区域品牌价格表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+@Service
+public class BasicZonePriceServiceImpl extends BaseServiceImpl<BasicZonePriceMapper, BasicZonePriceEntity> implements IBasicZonePriceService {
+
+	@Override
+	public IPage<BasicZonePriceVO> selectBasicZonePricePage(IPage<BasicZonePriceVO> page, BasicZonePriceVO basicZonePrice) {
+		return page.setRecords(baseMapper.selectBasicZonePricePage(page, basicZonePrice));
+	}
+
+
+	@Override
+	public List<BasicZonePriceExcel> exportBasicZonePrice(Wrapper<BasicZonePriceEntity> queryWrapper) {
+		List<BasicZonePriceExcel> basicZonePriceList = baseMapper.exportBasicZonePrice(queryWrapper);
+		//basicZonePriceList.forEach(basicZonePrice -> {
+		//	basicZonePrice.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicZonePrice.getType()));
+		//});
+		return basicZonePriceList;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicStoreBrandWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.basicdata.entity.BasicStoreBrandEntity;
+import com.logpm.basicdata.vo.BasicStoreBrandVO;
+import java.util.Objects;
+
+/**
+ * 门店品牌中间表 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-05-15
+ */
+public class BasicStoreBrandWrapper extends BaseEntityWrapper<BasicStoreBrandEntity, BasicStoreBrandVO>  {
+
+	public static BasicStoreBrandWrapper build() {
+		return new BasicStoreBrandWrapper();
+ 	}
+
+	@Override
+	public BasicStoreBrandVO entityVO(BasicStoreBrandEntity basicStoreBrand) {
+		BasicStoreBrandVO basicStoreBrandVO = Objects.requireNonNull(BeanUtil.copy(basicStoreBrand, BasicStoreBrandVO.class));
+
+		//User createUser = UserCache.getUser(basicStoreBrand.getCreateUser());
+		//User updateUser = UserCache.getUser(basicStoreBrand.getUpdateUser());
+		//basicStoreBrandVO.setCreateUserName(createUser.getName());
+		//basicStoreBrandVO.setUpdateUserName(updateUser.getName());
+
+		return basicStoreBrandVO;
+	}
+
+
+}