diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java b/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java index 66964220..6638877e 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java @@ -9,6 +9,7 @@ package com.suisung.mall.common.modules.esign; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -54,12 +55,18 @@ public class EsignPlatformInfo implements Serializable { @ApiModelProperty(value = "平台方营业执照上的经营内容") private String license_content; - @ApiModelProperty(value = "代理商的省/市/区,如:广东省/深圳市/福田区") + @ApiModelProperty(value = "代理商执照的省/市/区,如:广东省/深圳市/福田区") private String license_area; - @ApiModelProperty(value = "代理商的省id/市id/区id,如:11000/11100/11101") + @ApiModelProperty(value = "代理商营业执照的省id/市id/区id,如:11000/11100/11101") private String license_district_id; + @ApiModelProperty(value = "期望代理的省/市/区,如:广东省/深圳市/福田区") + private String agent_area; + + @ApiModelProperty(value = "期望代理的省id/市id/区id,如:11000/11100/11101") + private String agent_district_id; + @ApiModelProperty(value = "平台方营业执照公司详细地址") private String license_address; @@ -114,6 +121,7 @@ public class EsignPlatformInfo implements Serializable { @ApiModelProperty(value = "邀请码,后期跟收益有关") private String invite_code; + @TableField(exist = false) @ApiModelProperty(value = "代理商邀请链接") private String invite_url; diff --git a/mall-shop/pom.xml b/mall-shop/pom.xml index 3380cf21..7f01756f 100644 --- a/mall-shop/pom.xml +++ b/mall-shop/pom.xml @@ -459,6 +459,7 @@ application.yml bootstrap.yml bootstrap-${profiles.active}.yml + **/*.yml **/*.xml **/*.crt **/*.pem diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java index d18a2472..4e5cf2aa 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java @@ -47,7 +47,7 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; @Service public class EsignPlatformInfoServiceImpl extends BaseServiceImpl implements EsignPlatformInfoService { - @Value("${website.domain}") + @Value("${website_domain}") private String websiteDomain; @Lazy @@ -531,6 +531,8 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl D:/wwwroot/mall/public/static - https://www.gpxscs.cn + https://www.gpxscs.cn https://mall.gpxscs.cn https://static.gpxscs.cn