Merge remote-tracking branch 'origin/dev_20230526_Mobile'

# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/components/tools/UserMenu.vue
2023-06-25 22:28:26 +08:00
parent d3a7f07e3e 41241446a5
commit a6f0e47cd8
133 changed files with 11279 additions and 133 deletions
@@ -4,6 +4,7 @@ public enum DictCodeEnum {

    DUTY_TERRITORY("责任领域","duty_territory"),
    BRAND("品牌","brand"),
+    STATE("文档库-状态","state"),
    ;
    String name;
    String value;