- 05 Nov, 2019 4 commits
-
-
周健威 authored -
周健威 authored
-
周健威 authored
# Conflicts: # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
-
周健威 authored
-
- 04 Nov, 2019 25 commits
-
-
hanfeng authored
-
hanfeng authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
-
libin authored
-
hezhen authored
-
hezhen authored
-
hanfeng authored
-
hanfeng authored
-
jiaorz authored
-
jiaorz authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
hanfeng authored
-
jiaorz authored
-
hanfeng authored
-
jiaorz authored
-
libin authored
-
hanfeng authored
-
hanfeng authored
-
jiaorz authored
-
周健威 authored
-
周健威 authored
-
jiaorz authored
-
jiaorz authored
-
libin authored
-
- 01 Nov, 2019 11 commits
-
-
libin authored
-
hezhen authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
libin authored
-
周健威 authored
-
周健威 authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java # ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java # xx-order/xx-order-server/src/test/java/ServiceTest.java # xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
-
hezhen authored
-
