-
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
6e32fa72
