- 28 Nov, 2019 33 commits
-
-
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/OrderAccountBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderMemberReceivedStatisticsBiz.java # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentVehicleReceivedStatisticsBiz.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/main/resources/mapper/OrderAccountMapper.xml # xx-order/xx-order-server/src/test/java/ServiceTest.java # xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/DictionaryBiz.java # xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml
-
libin authored
-
libin authored
-
hanfeng authored
-
hanfeng authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
hanfeng authored
-
hanfeng authored
-
zuoyh authored
-
hanfeng authored
-
hanfeng authored
-
zuoyh authored
-
hanfeng authored
-
hanfeng authored
-
zuoyh authored
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
zuoyh authored
-
jiaorz authored
-
jiaorz authored
-
libin authored
# Conflicts: # ace-common/src/main/java/com/github/wxiaoqi/security/common/enumconstant/LevelEnum.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/DeductionTypeEnum.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java # xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDTO.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/main/resources/mapper/OrderAccountMapper.xml # xx-order/xx-order-server/src/test/java/ServiceTest.java # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
-
libin authored
-
hanfeng authored
-
jiaorz authored
-
jiaorz authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
jiaorz authored
# Conflicts: # xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
-
jiaorz 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
-
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
-
hanfeng authored
-
- 27 Nov, 2019 7 commits
