github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #119 from LQYBill/release 

Release 2.9.1
pull/8040/head
Qiuyi LI 2024-10-17 17:52:23 +02:00 committed by GitHub
parent c2656ac2d6 404aaa3900
commit 1808c131c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
View File

@ -1128,7 +1128,7 @@
WHERE p.erp_status in (1, 2) WHERE p.erp_status in (1, 2)
AND sr.is_active = 1 AND sr.is_active = 1
AND p.platform_order_id NOT IN (SELECT platform_order_id FROM shouman_order) AND p.platform_order_id NOT IN (SELECT platform_order_id FROM shouman_order)
AND p.order_time > '2024-10-01' AND p.create_time > '2024-10-01'
</sql> </sql>
<select id="pagePotentialShoumanOrders" <select id="pagePotentialShoumanOrders"
@ -1152,6 +1152,6 @@
WHERE p.erp_status in (1, 2) WHERE p.erp_status in (1, 2)
AND sr.is_active = 1 AND sr.is_active = 1
AND p.platform_order_id NOT IN (SELECT platform_order_id FROM shouman_order) AND p.platform_order_id NOT IN (SELECT platform_order_id FROM shouman_order)
AND p.order_time > '2024-10-01' AND p.create_time > '2024-10-01'
</select> </select>
</mapper> </mapper>

2
jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
View File

@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE}
${AnsiColor.BRIGHT_GREEN} ${AnsiColor.BRIGHT_GREEN}
WIA APP Version: 2.9.0 WIA APP Version: 2.9.1
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
Website: www.wia-sourcing.com Website: www.wia-sourcing.com
${AnsiColor.BLACK} ${AnsiColor.BLACK}

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId> <artifactId>jeecg-boot-parent</artifactId>
<version>2.9.0</version> <version>2.9.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version}</name> <name>WIA APP ${project.version}</name>