Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-10-23 77c7984fb636f81a87208aea2bcffc701f6419e8

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java

@@ -18,7 +18,7 @@
import java.util.Map;

@RestController
@RequestMapping("/MaterialInventory")
@RequestMapping("/materialInventory")
@Api(value="物料库存controller",tags={"物料库存操作接口"})
public class MaterialInventoryController {
    @Autowired