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

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -221,7 +221,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         // 基础保存
         String joinTags = CollectionUtils.isEmpty(req.getOrderTags()) ? "" : String.join(",", req.getOrderTags());
         entity.setBeanTags(joinTags);
-        entity.setBeanPriority(req.getPriority().equals("1") ? "紧急" : "正常");
+        entity.setBeanPriority(req.getPriority());
         entity.setIsMultiple(joinTags.contains("重物搬运") ? 1 : 0);
         //一家多单
         Result<String> addMultipleOrders = orderInfoService.addMultipleOrders(entity.getDt(), location.getAddressId(), orderId);