# Conflicts: # service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java # service/publicapi/src/main/resources/data/getSmgl.json # service/publicapi/src/main/resources/data/getThgl.json