Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-08-20 1c02f5b648cd3c58a7db7dcec761071d5daabb26

 zy-asrs-admin/src/views/system/language/edit.vue

@@ -77,8 +77,8 @@
                <a-form-item :label="formatMessage('db.sys_language.locale', '地区')" name="locale"
                    style="width: 250px;">
                    <a-select v-model:value="formData.locale" :options="[
                        { label: '简体中文', value: 'zhCN' },
                        { label: 'English', value: 'enUS' },
                        { label: '简体中文', value: 'zh_CN' },
                        { label: '英语', value: 'en_US' },
                    ]">
                    </a-select>
                </a-form-item>