- 02 Dec, 2019 17 commits
-
-
jiaorz authored
-
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-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java # xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
-
jiaorz authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java # xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
-
jiaorz authored
-
libin authored
-
周健威 authored -
libin authored
-
libin authored
-
libin authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
周健威 authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java # xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
-
jiaorz authored
-
周健威 authored
# Conflicts: # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
-
- 30 Nov, 2019 6 commits
- 29 Nov, 2019 17 commits
-
-
libin authored
-
jiaorz authored
-
libin authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderViolationBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
-
jiaorz authored
-
libin authored
-
libin authored
-
libin authored
-
libin authored
-
hanfeng authored
-
hanfeng authored
# Conflicts: # ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java # xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml # xx-order/xx-order-server/src/test/java/ServiceTest.java
-
libin authored
-
libin authored
-
libin authored
-
jiaorz authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
