BJ_ZTEITS-Developers / parking-cloud-yudao

# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java

reactor：【INFRA 基础设施】代码生成时，更严格的区分 master 还是 master-jdk17 分支

 Conflicts:
	src/main/resources/application-local.yaml

 Conflicts:
	src/main/resources/application.yaml

梳理 druid 的配置

 Conflicts:
	pom.xml
	src/main/resources/application-local.yaml