safePlatform-out.git

国泰新华安全平台-外包

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

refs
author	zhangfeng <1603559716@qq.com>
	Friday, December 23, 2022 08:55 +0800
committer	zhangfeng <1603559716@qq.com>
	Friday, December 23, 2022 08:55 +0800
commit	5bd5f3bcd6d2cb375feb0756505691b551339716
tree	edf69848fee65f40a3ad75abad426a36bc1bf38b tree \| zip \| gz
parent	f7d2f20365467a834188edd35c464d9fb9349214 view \| diff 4dca59b54c8fc8815e3f533ce04f5e1b1328852f view \| diff

Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

 Conflicts:
	pom.xml

1 files renamed

4 files modified

	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java	2 ●●●●● diff \| view \| raw \| blame \| history
	pom.xml	37 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml	28 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-online-uat.yaml	28 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application.yaml	13 ●●●●● diff \| view \| raw \| blame \| history