Merge branch 'master-zjw' into dev

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

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

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -36,6 +36,15 @@
             <if test="lon != null and lat != null">
                 and longitude is not null and latitude is not null
             </if>
+            <if test="state != null">
+                and state = #{state}
+            </if>
+            <if test="isShow != null">
+                and is_show = #{isShow}
+            </if>
+            <if test="isDel != null">
+                and is_del = #{isDel}
+            </if>
         </where>
         <if test="lon != null and lat != null">
             order by distance asc