Merge remote-tracking branch 'origin/master' into master-ucc-feature

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -69,7 +69,7 @@
             and `city`=#{cityCode}
         </if>
         GROUP BY cs.id
-        order by `hot`DESC,`crt_time` DESC
+        order by cs.hot DESC,cs.crt_time DESC
     </select>
 
     <!--首页查询全部-->

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1467,6 +1467,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Example example = new Example(Vehicle.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("code", code);
+        criteria.andEqualTo("isDel",0);
         if (StringUtils.isNotEmpty(id)) {
             criteria.andNotEqualTo("id", id);
         }