Merge remote-tracking branch 'origin/orderChange' into zhairh

api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java

@@ -8,4 +8,5 @@ public class BusTypeChangeFilterRequest extends ListPageRequest {
 
     private String action;
     private String originAction;
+    private String name;
 }

api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml

@@ -35,6 +35,10 @@
             <if test="originAction != ''and originAction != null">
                 AND basic_bustype_pre.`originAction` = #{originAction}
             </if>
+            <if test="name != '' and name != null">
+                AND  busTypeB.`name` like concat('%',#{name},'%')
+            </if>
+
 
         </where>
     </select>