Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2024-12-20 78ff74dfc9c42ee12993ac01c43063d0432231e3

 src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js

@@ -121,7 +121,7 @@
            limit();
            var d ="当页总数量:";
            Object.keys(res.countData).forEach(key => {
                d = d + key + "--" + res.countData[key]+"; ";
                d = d + key + "：" + res.countData[key]+"; ";
            });
            $("#countData").text(d);
        }