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

廖井涛

2024-04-28 ed2823ccf96675ab29414a588bba85bb8852ef9d

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

@@ -3,7 +3,8 @@
        userErr:'Please enter your user id',
        pwErr:'Please enter your password',
        loginSuccessful:'User login successful',
        connectErr:'server connection failed',
        loginErr:'The account or password is incorrect',
        connectErr:'Login timed out, please login again',
        user:'User',
        password:'Pass',
        SysName:'North Glass ERP System',
@@ -15,6 +16,10 @@
        titleFirst:"Welcome ",
        titleLast:' to use North Glass ERP system！'
    },
    error:{
        Code_401:'The user does not have this permission',
        Code_402:'Login timed out, please login again'
    },
    basicData:{
        create:'New Order',
        review:"Review",