406 Commits

Author SHA1 Message Date
ludj
bae7969474 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:19:59 +08:00
ludj
d2476700fa rev: 去掉swagger 2024-01-16 20:17:22 +08:00
USER-20220102CG\noblelift
885237fcae rev 更新 2024-01-16 20:06:45 +08:00
USER-20220102CG\noblelift
d238f62957 rev 更新日志 2024-01-16 20:04:44 +08:00
ludj
0cea3574a8 rev:定时任务线程修复 2024-01-16 19:53:57 +08:00
USER-20220102CG\noblelift
3da40b153d init 二期ACS 2024-01-16 16:31:20 +08:00