java/zhihuishenqu.git

			@@ -17,16 +17,8 @@
			config:
			server:
			git:
			<<<<<<< HEAD:springcloud_k8s_panzhihuazhihuishequ/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
			uri: http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
			uri: http://gitlab.nhys.cdnhxx.com/root/zhihuishequ/-/tree/master/config_repo
			# search-paths: adminConfig
			username: huanghongfa
			password: huanghongfa123456
			basedir: F:\nahan\panzhihua_zhihuishequ\zhihuishequ
			=======
			uri: http://gitlab.nhys.cdnhxx.com/root/zhihuishequ/-/tree/master/springcloud_k8s_panzhihuazhihuishequ/config-repo.git
			# search-paths: adminConfig
			username: huanghongfa
			password: huanghongfa123456
			basedir: F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\springcloud_k8s_panzhihuazhihuishequ\config-repo
			>>>>>>> 8c6a1a9341e03a14e933fb60364b17c694350445:springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml

	.gitkeep	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	applets-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	appletsbackstage-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	auth-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	community-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	communitybackstage-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	eureka-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	partybuilding.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zuul-dev.yml	补丁 \| 查看 \| 原始文档 \| blame \| 历史