safePlatform-out.git

refs
author	songhuangfeng123 <shf18767906695@163.com>
	Friday, September 2, 2022 10:10 +0800
committer	songhuangfeng123 <shf18767906695@163.com>
	Friday, September 2, 2022 10:10 +0800
commit	fabd08d87d00bfdf1aacf473fd905fdd3c903ed3
tree	d0c4827e1e087db6248f03cdd68b890b9b5829df tree \| zip \| gz
parent	d59ce37bc27d01da323b79c10200e93796865fee view \| diff 57b39bca1c6a2b6e5d2b9acc2b0238c4ad5d6005 view \| diff

Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang

	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/schedule/KeepAliveRobot.java	27 ●●●●● diff \| view \| raw \| blame \| history
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java	27 ●●●●● diff \| view \| raw \| blame \| history
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java	27 ●●●●● diff \| view \| raw \| blame \| history
	incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/schedule/KeepAliveRobot.java	27 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java	6 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java	6 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java	6 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java	14 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java	16 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-dev.yaml	11 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml	11 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml	11 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml	9 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-test.yaml	9 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-uat.yaml	9 ●●●●● diff \| view \| raw \| blame \| history