- 20 Sep, 2019 9 commits
- 19 Sep, 2019 15 commits
-
-
hezhen authored
-
hezhen authored
-
hezhen authored
-
hezhen authored
-
hezhen authored
-
hezhen authored
Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity
-
hezhen authored
-
hezhen authored
-
hanfeng authored
-
hezhen authored
-
hezhen authored
-
hezhen authored
-
hanfeng authored
-
hezhen authored
-
hezhen authored
-
- 16 Sep, 2019 4 commits
-
-
libin authored
-
libin authored
-
libin authored
-
jiaorz authored
# Conflicts: # xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
-
- 12 Sep, 2019 6 commits
-
-
jiaorz authored
-
jiaorz authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookInfoMapper.xml
-
libin authored
-
libin authored
-
libin authored
-
jiaorz authored
-
- 11 Sep, 2019 6 commits
