Merge branch 'master_after20' into master_cj_zq

@@ -191,6 +191,10 @@
             <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
                 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (cu.name LIKE CONCAT('%', #{vo.searchKey},'%')
+                or tb.order_no LIKE CONCAT('%', #{vo.searchKey},'%'))
+            </if>
             <if test="vo.orderDateStart != null">
                 AND tb.order_date >= #{vo.orderDateStart}
             </if>