# Conflicts: # src/main/java/com/gogirl/infrastructure/service/file/impl/QiniuFileServiceImpl.java # src/main/java/com/gogirl/interfaces/user/FileController.java
# Conflicts: # src/main/java/com/gogirl/domain/order/mall/MallOrder.java
# Conflicts: # src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
