Merge branch 'master_0929' into master_after20

@@ -23,6 +23,14 @@ public class QueryCustomerVo extends SortPageVo implements BaseVo, Serializable
   @ApiModelProperty("名称")
   private String name;
 
+    /**
+     * 搜索关键字
+     * 名称或编号
+     * 移动端使用
+     */
+    @ApiModelProperty("搜索关键字")
+    private String searchKey;
+
   /**
    * 状态
    */

@@ -90,6 +90,10 @@
                         AND 1 = 1  <!-- 确保查询到任何数据 -->
                     </otherwise>
                 </choose>
+                <if test="vo.searchKey != null and vo.searchKey != ''">
+                    AND (c.code LIKE CONCAT('%', #{vo.searchKey}, '%')
+                    OR c.name LIKE CONCAT('%', #{vo.searchKey}, '%'))
+                </if>
             </if>
         </where>
         ORDER BY c.code