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

chenlu

2024-08-07 f7341938e2a9f843784eec6b777f6d73a930c9ad

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

@@ -296,6 +296,7 @@
        totalArea:'TotalArea',
        childWidth:'Child Width',
        childHeight:'Child Height',
        arc:'arc',
        area:'Area',
        process:'Process',
        orderDetail:'Order Detail',