Merge remote-tracking branch 'origin/master'

cy

2023-12-02 cd146ec4e1f80c6666d7696f75c060c052145d30

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java

@@ -51,7 +51,7 @@
    @Autowired
    private CodeGeneratorService codeGeneratorService;
    @Autowired
    private BaseWarehouseServiceImpl baseWarehouseService;
    private BaseWarehouseService baseWarehouseService;
    @Autowired
    private FinSysTenantDepartmentService departmentService;
    @Autowired
@@ -61,9 +61,9 @@
    @Autowired
    private SDictDataServiceImpl sDictDataService;
    @Autowired
    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
    private BaseGoodsModelsService baseGoodsModelsService;
    @Autowired
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    private BaseGoodsTemplateService baseGoodsTemplateService;
    @Autowired
    private LWhFormScrappedCoreService lWhFormScrappedCoreService;