Merge remote-tracking branch 'origin/master'

futian.liu

2023-12-05 8e4000461f3a6bbee34068b78ed60292c0ada611

 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java

@@ -4,7 +4,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.pojo.query.WarehouseQry;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -33,7 +33,7 @@
public class BaseWarehouseController extends BaseController {

    @Autowired
    private BaseWarehouseServiceImpl baseWarehouseService;
    private BaseWarehouseService baseWarehouseService;
    @Autowired
    private LWhGoodsService lWhGoodsService;