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

Merge pull request #45 from LQYBill/release 

Merge hotfix 1.8.2 to dev
pull/6221/head
Qiuyi LI 2024-01-05 12:10:31 +01:00 committed by GitHub
parent 5930515a90 a986295eb4
commit 5b0e4afe42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 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/api/hualei/HLParcelTraceDetail.java
View File

@ -56,6 +56,8 @@ public class HLParcelTraceDetail {
private static final String SORTING_CENTER_PROCESSING = "[Fenggang Town] Processing at sorting center"; private static final String SORTING_CENTER_PROCESSING = "[Fenggang Town] Processing at sorting center";
private static final String ORDER_RECEIVED = "货物电子信息已经收到"; private static final String ORDER_RECEIVED = "货物电子信息已经收到";
private static final String ORDER_RECEIVED_EN = "Order received by logistics company"; private static final String ORDER_RECEIVED_EN = "Order received by logistics company";
private static final String OPERATION_CENTER_DEPARTURE_CN = "货物离开操作中心";
private static final String OPERATION_CENTER_DEPARTURE_EN = "Departed from operation center";
public HLParcelTraceDetail() { public HLParcelTraceDetail() {
@ -124,6 +126,10 @@ public class HLParcelTraceDetail {
case SORTING_CENTER_DEPARTURE: case SORTING_CENTER_DEPARTURE:
setScanType(FACILITY_DEPARTURE.getDesc()); setScanType(FACILITY_DEPARTURE.getDesc());
break; break;
case OPERATION_CENTER_DEPARTURE_CN:
setDescriptionEn(OPERATION_CENTER_DEPARTURE_EN);
setScanType(FACILITY_DEPARTURE.getDesc());
break;
case SORTING_CENTER_PROCESSING: case SORTING_CENTER_PROCESSING:
setScanType(FACILITY_ARRIVED.getDesc()); setScanType(FACILITY_ARRIVED.getDesc());
break; break;

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>1.8.1</version> <version>1.8.2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WIA APP ${project.version} </name> <name>WIA APP ${project.version} </name>