Merge branch 'master' into 外协收回按炉结算判断

src/main/java/cn/ezhizao/project/business/controller/BizBeforeCheckoutVerifyController.java

@@ -277,7 +277,7 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
             balanceAccount.setReturnNo(receiptDetail.getFormCode());
             balanceAccount.setOutsourceNo(bizOutsourcedOrder.getFormCode());
             balanceAccount.setFurnaceNum(1);
-            balanceAccount.setCheckDate(bizProcessInspecion.getStartTime());
+            balanceAccount.setCheckDate(bizProcessInspecion.getEndTime());
             balanceAccount.setMaterialLossRatio(bizSupplier.getLossLimit());
             balanceAccount.setShape(l.getBizMaterialBase().getXzcode());
             balanceAccount.setDensity(l.getBizMaterialBase().getDensity());

src/main/java/cn/ezhizao/project/business/controller/BizCheckCategoryController.java

@@ -43,7 +43,6 @@ public class BizCheckCategoryController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizCheckCategory bizCheckCategory) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizCheckCategory);
         startPage();
         List<BizCheckCategory> list = bizCheckCategoryService.getList(bizCheckCategory);
         return getDataTable(list);