Merge branch 'main' of http://117.174.100.38:3000/lishiqiang/ship-ota-server into main1

 Conflicts:

	ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -38,6 +38,9 @@ public class TradeOrderRespNewVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10096")
     private Long id;
 
+    @Schema(description = "销售员ID")
+    private String sellerId;
+
     @Schema(description = "订单号")
     @ExcelProperty("订单号")
     private String orderNo;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -537,7 +537,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             Map<String, Object> extMap = new HashMap<>();
             extMap.put("result", "审核撤回");
             TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
-
+        }else{
+            return CommonResult.success("新增订单审核状态不能回退");
         }
         return CommonResult.success("撤回成功");
     }