Merge branch 'dev' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java

@@ -559,10 +559,7 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "是否在公海")
     private Boolean isInOpenSea;
 
-    @ApiModelProperty(value = "订单异常状态(字典 order_abnormal_state)")
-    private List<Integer> abnormalStates;
-
-    @ApiModelProperty(value = "订单异常状态(字典 order_abnormal_state)")
+    @ApiModelProperty(value = "始发地ids")
     private List<Long> objectiveIds;
 
     @ApiModelProperty(value = "始发仓IDs")

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/job/ReceiptAutoWriteOffJob.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.wealth.controller.admin.job;
 
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
-import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.wealth.dal.dataobject.receipt.ReceiptDO;
@@ -19,7 +18,6 @@ import java.util.List;
  * 收款单自动核销任务
  */
 @Component
-@TenantJob
 @Slf4j
 public class ReceiptAutoWriteOffJob implements JobHandler {
 
@@ -53,6 +51,7 @@ public class ReceiptAutoWriteOffJob implements JobHandler {
             try {
                 //判断当前收款单下的收款明细是不是全部是已核销并且核销比例要大于配置(params)
                 Boolean result = receiptService.judgingProportion(receiptDO, paramArray[0]);
+                log.error("收款单判断{},{}", receiptDO.getReceiptNo(), result);
                 if (result) {
                     receiptService.autoWriteOffReceipt(receiptDO, paramArray[1], adminUserRespDTO.getNickname());
                 }