Skip to content

C
cloud-platform
Switch branch/tag
  1. 29 Nov, 2019 29 commits
  3. 28 Nov, 2019 11 commits
    • zuoyh's avatar
      修复覆盖了的代码 · bc5a98b8
      zuoyh authored
      bc5a98b8
    • libin's avatar
      Merge branch 'order_received_statistics' into dev · 56b4b783
      libin authored 
      # Conflicts:
#	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-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/mapper/VehicleDepartureLogMapper.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
      56b4b783
    • libin's avatar
      对比master分支修复 · 7c4fcab7
      libin authored
      7c4fcab7
    • libin's avatar
      fix · 54535445
      libin authored
      54535445
    • hanfeng's avatar
      Merge branch 'master-report-form' into dev · 82294f58
      hanfeng authored
      82294f58
    • hanfeng's avatar
      总业绩统计 · 36b43985
      hanfeng authored
      36b43985
    • libin's avatar
      用远程dev覆盖本地dev · b5429461
      libin authored
      b5429461
    • libin's avatar
      用远程dev覆盖本地dev · a028908b
      libin authored
      a028908b
    • libin's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 7c06aae1
      libin authored
      7c06aae1
    • zuoyh's avatar
      Merge branch 'feature-vehicle-trip3' into dev · b4d3a650
      zuoyh authored
      b4d3a650
    • libin's avatar
      Merge branch 'order_received_statistics' into dev · 84a39605
      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
      84a39605