diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 815fbe996..fbdbde7dd 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
- jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+ jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: Glxp@6066
hikari:
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 077fd603d..69abca2d0 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
@@ -157,12 +157,12 @@
AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
-
- and (ico.billNo like concat('%', #{keywords}, '%')
- or ico.fromCorp like concat('%', #{keywords}, '%')
- or ico.fromCorpName like concat('%', #{keywords}, '%')
- or ico.fromType like concat('%', #{keywords}, '%'))
-
+
+
+
+
+
+
GROUP BY
ico.billNo