# Conflicts: # .idea/compiler.xml # module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java # module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java # module-system/pom.xml