From f686b5de3d427681c87b24c8e1fff00b33a5f434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sun, 9 Apr 2023 11:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E5=92=8C?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/system/SystemPDFTemplateEntity.java    | 2 ++
 src/main/resources/mybatis/mapper/basic/UdiProductDao.xml      | 3 +++
 .../resources/mybatis/mapper/system/SystemPDFTemplateDao.xml   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java
index 78080d25..a1f130dd 100644
--- a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java
+++ b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java
@@ -1,5 +1,6 @@
 package com.glxp.api.entity.system;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -18,6 +19,7 @@ public class SystemPDFTemplateEntity {
     private int qrcodeCount;
     private String remark;
     private Date create_time;
+    @TableField(value = "`update_time`")
     private Date update_time;
     private String jrxmlPath;
     private Integer bussinessType;
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 24572939..7103a37c 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -583,6 +583,9 @@
             <if test="allowNoProduct != null">
                 allowNoProduct=#{allowNoProduct},
             </if>
+            <if test="allowNoSerial != null">
+                allowNoSerial=#{allowNoSerial},
+            </if>
             <if test="spmc != null">
                 spmc=#{spmc},
             </if>
diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml
index 875b46d7..1f0e5b69 100644
--- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml
+++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml
@@ -5,7 +5,7 @@
 
     <select id="queryPage" parameterType="com.glxp.api.req.system.FilterPdfTemplateRequest"
             resultType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
-        SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time,jrxmlPath,bussinessType,bussinessStatus
+        SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time as update_time,jrxmlPath,bussinessType,bussinessStatus
         FROM sys_pdf_template
         <where>
             <if test="name != null and '' != name">