Commit Graph

11 Commits

Author SHA1 Message Date
USER-20220102CG\noblelift
c7d1367749 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-07-26 16:39:28 +08:00
USER-20220102CG\noblelift
b73c9e8c65 更新tlog支持 2024-07-26 16:38:50 +08:00
6babb1980c fix: 日志更新,取消任务和指令、创建人、配置文件线程数搞大 2024-07-19 13:26:19 +08:00
USER-20220102CG\noblelift
b43a390a6f rev 优化线程相关 2024-07-13 08:35:29 +08:00
6b82cc7967 fix: 异步循环依赖报错 2024-07-09 13:28:08 +08:00
d9a12ca3df fix: 配置文件修改 2024-07-09 08:57:03 +08:00
USER-20220102CG\noblelift
5b99185f24 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-01-16 21:08:50 +08:00
USER-20220102CG\noblelift
a1e888ffe4 rev 2024-01-16 21:08:32 +08:00
ludj
af43ab7830 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java
#	acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
2024-01-16 20:36:48 +08:00
ludj
d2476700fa rev: 去掉swagger 2024-01-16 20:17:22 +08:00
USER-20220102CG\noblelift
3da40b153d init 二期ACS 2024-01-16 16:31:20 +08:00