# Conflicts: # src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java # src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java # src/main/java/com/sqx/modules/orders/controller/app/AppOrdersController.java
# Conflicts: # src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java # src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java # src/main/java/com/sqx/modules/orders/controller/app/AppOrdersController.java