Merge remote-tracking branch 'origin/dev' into dev

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -90,7 +90,7 @@
         REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as name1
           from tour_good g
           LEFT JOIN (SELECT * FROM tour_good_tag WHERE is_del=0) tag ON g.id=tag.good_id
-        LEFT JOIN (SELECT * FROM tour_tag WHERE is_del=0) t ON tag.tag_id=t.id
+        LEFT JOIN (SELECT * FROM tour_tag WHERE is_del=0 and name!='全部') t ON tag.tag_id=t.id
          where g.recommend=1 and g.status=1 and g.is_del=0
          GROUP BY g.id
         ORDER BY g.rank DESC ,g.id DESC

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java

@@ -9,7 +9,7 @@ public class CompanySearchDTO {
     Integer addrCity;
     String lon;
     String lat;
-    Integer state = 1;
+    Integer state;
     Integer isShow = 1;
     Integer isDel = 0;
 }