safePlatform-out.git

refs
author	songhuangfeng123 <shf18767906695@163.com>
	Tuesday, July 19, 2022 15:28 +0800
committer	songhuangfeng123 <shf18767906695@163.com>
	Tuesday, July 19, 2022 15:28 +0800
commit	74c86606c9abc778a3848025395d7c7d6fbcfac0
tree	2cbd9d3a82564bcf3742e1110db9cb2151ee650e tree \| zip \| gz
parent	95c5a1da43d63a67e5ec35ed23b5eafabfc325f6 view \| diff 19ccd594cd2ead844e32fd7eeb7e2d0a1ccaad5a view \| diff

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

	incident-manage/incident-manage-rpc-api/pom.xml	19 ●●●●● diff \| view \| raw \| blame \| history
	incident-manage/incident-manage-rpc-provider/pom.xml	19 ●●●●● diff \| view \| raw \| blame \| history
	incident-manage/incident-manage-service/pom.xml	19 ●●●●● diff \| view \| raw \| blame \| history
	incident-manage/pom.xml	25 ●●●●● diff \| view \| raw \| blame \| history
	pom.xml	48 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/pom.xml	24 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java	23 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java	165 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java	4 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java	2 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigIncidentManage.java	75 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-dev.yaml	48 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml	50 ●●●●● diff \| view \| raw \| blame \| history
	safePlatfrom-out-web/src/main/resources/config/application.yaml	6 ●●●●● diff \| view \| raw \| blame \| history