Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

skyouc

2025-02-25 7a7e7117abe02043864d8737b3dbd4e6f2c51fa6

 rsf-admin/src/i18n/en.js

@@ -133,8 +133,8 @@
        dictType: 'DictType',
        dictData: 'DictData',
        companys: 'Companys',


        serialRuleItem: 'SerialRuleItem',
        serialRule: 'SerialRule',

    },
    table: {
@@ -343,8 +343,9 @@
                name: "name",
            },
            dictType: {
                name: "name",
                description: "description",
                code: "Code",
                name: "Name",
                description: "Description",
            },
            dictData: {
                dictTypeId: "dictTypeId",
@@ -368,6 +369,23 @@
                city: "City",
                address: "Address",
            },
            serialRuleItem: {
                ruleId: "ruleId",
                wkType: "wkType",
                feildValue: "feildValue",
                len: "len",
                lenStr: "lenStr",
                sort: "sort",
            },
            serialRule: {
                code: "code",
                name: "name",
                delimit: "delimit",
                reset: "reset",
                resetDep: "resetDep",
                currValue: "currValue",
                lastCode: "lastCode",
            },
        }
    },
    page: {