diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java index 8103318..1519f16 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java @@ -80,6 +80,16 @@ public class CardTemplateUseDTO { private String templateCharge; @ApiModelProperty(name = "cardTemplateUseDispatchPhoto", value = "我的名片二维码") private String cardTemplateUseDispatchPhoto; + @ApiModelProperty(name = "cardTemplateUseSystem", value = "系统默认名片") + private String cardTemplateUseSystem; + + public String getCardTemplateUseSystem() { + return cardTemplateUseSystem == null ? "" : cardTemplateUseSystem; + } + + public void setCardTemplateUseSystem(String cardTemplateUseSystem) { + this.cardTemplateUseSystem = cardTemplateUseSystem; + } public String getCardTemplateUsePictureUrl() { return cardTemplateUsePictureUrl == null ? "" : cardTemplateUsePictureUrl; diff --git a/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml b/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml index 6313538..cee0cab 100644 --- a/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml +++ b/src/main/resources/mybatis/mapper/cardtemplateuse/card-template-use-mapper.xml @@ -26,6 +26,7 @@ + @@ -260,6 +261,7 @@ t1.template_industry, t1.template_charge, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, @@ -296,6 +298,7 @@ t1.template_industry, t1.template_charge, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, @@ -332,6 +335,7 @@ t1.template_industry, t1.template_charge, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, @@ -437,6 +441,7 @@ t1.template_industry, t1.template_charge, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, @@ -492,6 +497,7 @@ t1.card_template_use_default, t1.card_template_use_order, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, @@ -542,6 +548,7 @@ t1.card_template_use_default, t1.card_template_use_order, t1.card_template_use_dispatch_photo, + t1.card_template_use_system, t1.creator, t1.gmt_create, t1.modifier, diff --git a/src/main/resources/static/route/shoptemplateconfig/list.html b/src/main/resources/static/route/shoptemplateconfig/list.html index a960483..8ffed45 100644 --- a/src/main/resources/static/route/shoptemplateconfig/list.html +++ b/src/main/resources/static/route/shoptemplateconfig/list.html @@ -69,7 +69,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/templateconfig/listpagetemplateconfig'; + var tableUrl = 'api/templateconfig/listpagetemplateconfig?templateProject=6b93f31d-7880-45ca-a9d3-ba406bfb7320'; // 初始化表格 function initTable() {