Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-19 8f53694cc7ed5b9965d172a511ab39b914edbfb6

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -138,7 +138,7 @@
        width:'宽',
        height:'高',
        area:'面积',
        trueArea:'实际单片金额',
        trueArea:'实际单片面积',
        trueGrossArea:'实际总面积',
        computeArea:'结算单片面积',
        computeGrossArea:'计算总面积',