Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -54,6 +54,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -493,6 +494,7 @@ public class UpBasicService {
         if (CollUtil.isNotEmpty(orderEntities)) {
             for (OrderEntity orderEntity : orderEntities) {
                 List<WarehouseEntity> codes = codesService.findByReceiptId(orderEntity.getId());
+                Collections.reverse(codes);
                 if (CollUtil.isNotEmpty(codes)) {
                     warehouseEntityList.addAll(codes);
                 }

api-admin/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=9991
+server.port=9992
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root