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

chenlu

1 天以前 a597d9c7d1975ab9fe0f01d1a3608497288eafe0

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

@@ -321,6 +321,7 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -1180,7 +1181,8 @@
        user :'用户列表',
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格'
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
    },

    glassPrice:{