Conflicts:

	ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java

 Conflicts:

	ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java

	ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java

	ym-influx/src/main/java/com/cnbm/influx/template/Event.java

Reviewed-on: #12

Reviewed-on: #11

Reviewed-on: #10

Reviewed-on: #9

 Conflicts:

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

 Conflicts:

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

Reviewed-on: #8

 Conflicts:

	ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

	ym-gateway/src/main/resources/application.yml

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

Reviewed-on: #7

Reviewed-on: #6

Reviewed-on: #5

 Conflicts:

	ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java