-
Merge remote-tracking branch 'origin/dev_lijing' into dev_tzl · 6f940765
# Conflicts: # app/build.gradle # app/src/main/java/com/yiring/app/domain/car/Car.java # app/src/main/java/com/yiring/app/domain/location/LocationTag.java # app/src/main/java/com/yiring/app/param/car/CarParam.java # app/src/main/java/com/yiring/app/param/car/CarQueryParam.java # app/src/main/java/com/yiring/app/param/dict/DictParam.java # app/src/main/java/com/yiring/app/param/dict/DictQueryParam.java # app/src/main/java/com/yiring/app/param/dict/DictTypeParam.java # app/src/main/java/com/yiring/app/param/dict/DictTypeQueryParam.java # app/src/main/java/com/yiring/app/param/video/VideoParam.java # app/src/main/java/com/yiring/app/param/video/VideoQueryParam.java # app/src/main/java/com/yiring/app/service/car/CarService.java # app/src/main/java/com/yiring/app/service/car/impl/CarServiceImpl.java # app/src/main/java/com/yiring/app/service/video/VideoService.java # app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java # app/src/main/java/com/yiring/app/vo/car/CarVo.java # app/src/main/java/com/yiring/app/vo/video/VideoVo.java # app/src/main/java/com/yiring/app/web/car/CarController.java # app/src/main/java/com/yiring/app/web/video/VideoController.java # basic-auth/build.gradle # basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java # basic-common/core/src/main/java/com/yiring/common/dict/Dict.java # basic-common/core/src/main/java/com/yiring/common/dict/DictType.java # basic-common/util/build.gradle # basic-common/util/src/main/java/com/yiring/common/util/DictUtils.java # basic-common/util/src/main/java/com/yiring/common/util/StrUtils.java # build.gradle
Administrator authored
