# Conflicts:
#	ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java

Reviewed-on: #16

Reviewed-on: #15

Reviewed-on: #14

 Conflicts:

	ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java

Reviewed-on: #13

 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