# Conflicts: # auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java # auto-solution-common/src/main/java/com/solution/common/constant/PlatformAndModuleConstants.java # pom.xml
# Conflicts: # auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java # auto-solution-common/src/main/java/com/solution/common/constant/PlatformAndModuleConstants.java # pom.xml