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

Merge pull request #118 from LQYBill/release 

Release 2.9.0
pull/8040/head
Qiuyi LI 2024-10-15 15:00:19 +02:00 committed by GitHub
parent 8bc536c585 e74994a5bb
commit abf75cf84b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java
View File

@ -44,7 +44,7 @@ public class AddPortraitTubeJob implements Job {
// TODO 2024-08-28 To delete when no longer in use // TODO 2024-08-28 To delete when no longer in use
private static final String TUBE_50_SKU_MULTIPLE = "PJ95530040-WIA"; private static final String TUBE_50_SKU_MULTIPLE = "PJ95530040-WIA";
// private static final String TUBE_NEW_40_SKU_SINGLE = "PJ349400032-JCH"; private static final String TUBE_NEW_40_SKU_SINGLE = "PJ349400032-JCH";
private static final String TUBE_NEW_40_SKU_MULTIPLE = "PJ349400045-JCH"; private static final String TUBE_NEW_40_SKU_MULTIPLE = "PJ349400045-JCH";
// private static final String TUBE_NEW_50_SKU_SINGLE = "PJ349500032-JCH"; // private static final String TUBE_NEW_50_SKU_SINGLE = "PJ349500032-JCH";
private static final String TUBE_NEW_50_SKU_MULTIPLE = "PJ349500045-JCH"; private static final String TUBE_NEW_50_SKU_MULTIPLE = "PJ349500045-JCH";
@ -53,7 +53,7 @@ public class AddPortraitTubeJob implements Job {
private static final List<String> TUBE_SKUS = Arrays.asList(TUBE_30_SKU_SINGLE_DOUBLE, TUBE_50_SKU_SINGLE, private static final List<String> TUBE_SKUS = Arrays.asList(TUBE_30_SKU_SINGLE_DOUBLE, TUBE_50_SKU_SINGLE,
TUBE_40_SKU_SINGLE, TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE, TUBE_40_SKU_SINGLE, TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE,
TUBE_NEW_60_SKU_MULTIPLE, TUBE_40_SKU_MULTIPLE, TUBE_50_SKU_MULTIPLE); TUBE_NEW_60_SKU_MULTIPLE, TUBE_40_SKU_MULTIPLE, TUBE_50_SKU_MULTIPLE, TUBE_NEW_40_SKU_SINGLE);
private static final String PREFIX_50_CANVAS = "JJ2501"; private static final String PREFIX_50_CANVAS = "JJ2501";
private static final String PREFIX_50_CANVAS_CHROME = "JJ2001"; private static final String PREFIX_50_CANVAS_CHROME = "JJ2001";
private static final String PREFIX_40_CANVAS = "JJ2500"; private static final String PREFIX_40_CANVAS = "JJ2500";
@ -317,7 +317,7 @@ public class AddPortraitTubeJob implements Job {
adequateTubes.add(Pair.of(TUBE_NEW_60_SKU_MULTIPLE, tubeNew60MultipleCount)); adequateTubes.add(Pair.of(TUBE_NEW_60_SKU_MULTIPLE, tubeNew60MultipleCount));
} }
if (tube40SingleCount > 0) { if (tube40SingleCount > 0) {
adequateTubes.add(Pair.of(TUBE_40_SKU_SINGLE, tube40SingleCount)); adequateTubes.add(Pair.of(TUBE_NEW_40_SKU_SINGLE, tube40SingleCount));
} }
if (tubeNew50MultipleCount > 0) { if (tubeNew50MultipleCount > 0) {
adequateTubes.add(Pair.of(TUBE_NEW_50_SKU_MULTIPLE, tubeNew50MultipleCount)); adequateTubes.add(Pair.of(TUBE_NEW_50_SKU_MULTIPLE, tubeNew50MultipleCount));

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.8.0 WIA APP Version: 2.9.0
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.8.0</version> <version>2.9.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version}</name> <name>WIA APP ${project.version}</name>