From d6c502383063b35af992bd6f7f423e92bb8640bc Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Wed, 11 Aug 2021 10:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=8A=A8=E6=8E=92=E7=89=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=9D=E5=AD=98=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/dtos/cardtemplateuse/CardTemplateUseDTO.java  | 10 ++++++++++
 .../cardtemplateuse/card-template-use-mapper.xml       |  7 +++++++
 .../static/route/shoptemplateconfig/list.html          |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

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 @@
         <result column="template_industry" property="templateIndustry"/>
         <result column="template_charge" property="templateCharge"/>
         <result column="card_template_use_dispatch_photo" property="cardTemplateUseDispatchPhoto"/>
+        <result column="card_template_use_system" property="cardTemplateUseSystem"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -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() {