-
# Conflicts: # monitor-service-web/src/main/resources/product/config.properties # monitor-service-web/src/main/resources/test/config.properties
-
2.fix db column name
-
Conflicts: monitor-service-mysql/pom.xml
# Conflicts: # monitor-service-web/src/main/resources/product/config.properties # monitor-service-web/src/main/resources/test/config.properties
2.fix db column name
Conflicts: monitor-service-mysql/pom.xml