From a11ac74a4c4c29d4306065765db917d2bbe4ea60 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 19 Aug 2022 15:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/req/business/StockOrderFilterRequest.java | 4 ---- api-admin/src/main/resources/application.properties | 2 +- .../main/resources/mybatis/mapper/inventory/InvProductDao.xml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java index ed843beb..a09754b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java @@ -40,10 +40,6 @@ public class StockOrderFilterRequest extends ListPageRequest { private boolean entrustEnd; private String localAction; - private String startDate; //起始日期 - private String endDate; //结束日期 - - private String orderId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index e487e916..cb3acd23 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=dev +spring.profiles.active=test1 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index f5a9b18c..e21c6a86 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -32,7 +32,7 @@ AND inv_product.ylqxzcrbarmc like concat('%',#{ylqxzcrbarmc},'%') - AND inv_product.zczbhhzbapzbh =like concat('%',#{zczbhhzbapzbh},'%') + AND inv_product.zczbhhzbapzbh like concat('%',#{zczbhhzbapzbh},'%') AND supId = #{supId}