Skip to content

C
cloud-platform
Switch branch/tag
  1. 29 Nov, 2019 37 commits
  3. 28 Nov, 2019 3 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