ludj
|
318d5532d7
|
Merge branch 'admin' into acs_v1.0.0
# Conflicts:
# nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
|
2024-06-06 13:08:51 +08:00 |
|
ludj
|
4e4c6f1744
|
Merge branch 'acs_v1.0.0' of http://121.40.234.130:8899/root/nl_admin into acs_v1.0.0
|
2024-06-05 17:56:00 +08:00 |
|
ludj
|
8e63f5246d
|
代码更新
|
2024-06-05 17:55:18 +08:00 |
|
ludj
|
c853b02b51
|
代码更新
|
2024-06-05 17:52:55 +08:00 |
|
|
|
987e68bfa8
|
test: 测试提交
|
2024-06-05 17:27:24 +08:00 |
|
|
|
83816781f8
|
test: 测试提交
|
2024-06-05 16:07:59 +08:00 |
|
|
|
9e533f5d90
|
test: 测试提交
|
2024-06-05 15:59:28 +08:00 |
|
|
|
694be67936
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
# Conflicts:
# nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
# nladmin-system/nlsso-server/src/main/resources/config/application.yml
|
2024-06-05 15:06:10 +08:00 |
|
|
|
77271cc801
|
rev: admin 配置文件
|
2024-06-05 14:59:51 +08:00 |
|
|
|
b8561580d5
|
rev: acs 修复国际化
|
2024-06-03 16:21:36 +08:00 |
|
|
|
c9308d3f0d
|
fix: acs_v1.0.0 修复bug
|
2024-06-03 15:31:19 +08:00 |
|
|
|
bff324b280
|
Merge remote-tracking branch 'origin/admin' into admin
|
2024-05-31 08:52:21 +08:00 |
|
|
|
adafb2cec5
|
rev: admin 修复国际化
|
2024-05-31 08:52:10 +08:00 |
|
ludj
|
9c0db5c954
|
rev：代码修改
|
2024-05-30 18:09:52 +08:00 |
|
|
|
9f050bd0ed
|
rev: acs api位置挪动
|
2024-05-29 18:26:09 +08:00 |
|
|
|
101d3d471b
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-29 16:15:00 +08:00 |
|
|
|
7659065a68
|
rev: api位置挪动
|
2024-05-29 15:16:08 +08:00 |
|
|
|
ae5d265bc1
|
fix: 添加缺省国际化
|
2024-05-29 14:38:26 +08:00 |
|
|
|
bcdba380cc
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
# Conflicts:
# nladmin-ui/src/i18n/langs/chinese.js
# nladmin-ui/src/i18n/langs/english.js
# nladmin-ui/src/i18n/langs/indonesian.js
# nladmin-ui/src/i18n/langs/task/en.js
# nladmin-ui/src/i18n/langs/task/in.js
# nladmin-ui/src/i18n/langs/task/zh.js
# nladmin-ui/src/views/monitor/online/locale/en.js
# nladmin-ui/src/views/monitor/online/locale/in.js
# nladmin-ui/src/views/monitor/online/locale/zh.js
# nladmin-ui/src/views/system/dept/locale/en.js
# nladmin-ui/src/views/system/dept/locale/in.js
# nladmin-ui/src/views/system/dept/locale/zh.js
# nladmin-ui/src/views/system/notice/locale/en.js
# nladmin-ui/src/views/system/notice/locale/in.js
# nladmin-ui/src/views/system/notice/locale/zh.js
# nladmin-ui/src/views/system/redis/locale/en.js
# nladmin-ui/src/views/system/redis/locale/in.js
# nladmin-ui/src/views/system/redis/locale/zh.js
# nladmin-ui/src/views/system/timing/locale/corn/en.js
# nladmin-ui/src/views/system/timing/locale/corn/in.js
# nladmin-ui/src/views/system/timing/locale/corn/zh.js
# nladmin-ui/src/views/system/timing/locale/en.js
# nladmin-ui/src/views/system/timing/locale/in.js
# nladmin-ui/src/views/system/timing/locale/zh.js
# nladmin-ui/src/views/tools/codeGen/locale/en.js
# nladmin-ui/src/views/tools/codeGen/locale/in.js
# nladmin-ui/src/views/tools/codeGen/locale/zh.js
# nladmin-ui/src/views/tools/storage/locale/en.js
# nladmin-ui/src/views/tools/storage/locale/in.js
# nladmin-ui/src/views/tools/storage/locale/zh.js
|
2024-05-29 09:51:35 +08:00 |
|
|
|
bba3cdc35b
|
rev: i18n位置挪动
|
2024-05-29 09:09:47 +08:00 |
|
ludj
|
a1565523ac
|
Merge branch 'acs_v1.0.0' of http://121.40.234.130:8899/root/nl_admin into acs_v1.0.0
|
2024-05-28 17:16:39 +08:00 |
|
|
|
9b0bf8f73e
|
fix: acs_v1.0.0 lucene位置
|
2024-05-28 17:09:05 +08:00 |
|
|
|
9a44f38d7f
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 17:04:11 +08:00 |
|
ludj
|
df89d088a3
|
代码格式调整
|
2024-05-28 16:31:14 +08:00 |
|
|
|
bdf2bcf569
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 16:02:21 +08:00 |
|
ludj
|
8bf43d5cc7
|
前端样式修改
|
2024-05-28 16:02:04 +08:00 |
|
|
|
4237306bc0
|
fix: 日志管理国际化
|
2024-05-28 16:00:18 +08:00 |
|
|
|
59d742dbd4
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 15:57:56 +08:00 |
|
ludj
|
e388b3debe
|
前端样式修改
|
2024-05-28 15:56:00 +08:00 |
|
|
|
e535909cf8
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 15:50:08 +08:00 |
|
ludj
|
2ffd105ac0
|
新建测试
|
2024-05-28 15:48:39 +08:00 |
|
ludj
|
a8e9962896
|
Merge branch 'admin' into acs_v1.0.0
|
2024-05-28 15:46:21 +08:00 |
|
|
|
345ab87917
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 15:42:07 +08:00 |
|
|
|
349ed3c90d
|
test: 测试
|
2024-05-28 15:40:53 +08:00 |
|
|
|
e81e1f15d3
|
fix：acs国际化
|
2024-05-28 14:21:05 +08:00 |
|
|
|
f7f336b65e
|
fix：frontend i18n
|
2024-05-28 10:45:04 +08:00 |
|
|
|
1eb98e3ca7
|
fix：frontend bugs
|
2024-05-28 10:13:16 +08:00 |
|
|
|
024c41fe03
|
refactor: nladmin-acs init
|
2024-05-28 09:58:57 +08:00 |
|
|
|
1179a5f154
|
fix: logback-spring.xml配置dev
|
2024-05-27 14:31:50 +08:00 |
|
|
|
f5e6db390a
|
refactor: 前后端基础部分
|
2024-05-27 14:15:48 +08:00 |
|
管理员
|
f23e4548cd
|
Initial commit
|
2024-05-27 09:48:12 +08:00 |
|
