Merge branch 'master-fix' into release

# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -355,7 +355,6 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             }
             preloadGoodsDOList.add(boxPreloadGoods);
         }
-
         // 插入
         boxPreloadGoodsMapper.insertBatch(preloadGoodsDOList);
 
@@ -363,6 +362,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             //修改为预装中
             boxDO.setPrStatus(PrStatusEnum.PRELOAD_ING.getPrStatus());
             boxService.updateById(boxDO);
+            for (Long oId : orderIdList) {
+                boxService.updateOrderStatus(oId, null, null,
+                        BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
+            }
             boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, "");
         } else if (boxDO.getPrStatus() == PrStatusEnum.PRELOAD_APPROVAL_SUCCESS.getPrStatus()) {
             //补单。修改订单状态
@@ -370,12 +373,14 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                 boxService.updateOrderStatus(oId, OrderStatusEnum.PRE_INSTALLED.getValue(), 0,
                         BoxStatusEnum.PREINSTALL_EXAMINE_SUCCESS.getStatus(), null, null, Boolean.FALSE);
             }
-
             //生成提单号
             boxService.generateBillLadingNo(shipmentId, false, false);
-
             boxService.addOrderLog(orderIdList, OrderShipmentLog.CABINET_PATCH, "");
         } else {
+            for (Long oId : orderIdList) {
+                boxService.updateOrderStatus(oId, null, null,
+                        BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
+            }
             boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, "");
         }