Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-12-26 a925836fa0ec4d3e5362a289995c5cb3a3942ed7

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java

@@ -15,6 +15,9 @@
    //工程信息
    List<Map<String, Object>> projectInfoMp(String projectNo);

    //工程信息流程卡
    List<Map<String, Object>> getProcessCardMp(String projectNo);

    //库存信息
    List<Map<String, Object>>  materialStoreMp(String thickness, String model);