- 13 Nov, 2019 1 commit
-
-
hanfeng authored
# Conflicts: # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
-
- 12 Nov, 2019 23 commits
-
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
jiaorz authored
# Conflicts: # ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java # ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/MailServiceImpl.java
-
hanfeng authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
-
hanfeng authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
hanfeng authored
-
- 11 Nov, 2019 16 commits
-
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
周健威 authored -
周健威 authored
-
周健威 authored
-
jiaorz authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
jiaorz authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
-
jiaorz authored
-
jiaorz authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
hanfeng authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
hanfeng authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java # ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
-
jiaorz authored
-
jiaorz authored
-
hanfeng authored
-
hanfeng authored
-
