Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -56,4 +56,8 @@ public class OrderSearch extends QueryInfo{
 
     @ApiModelProperty(value = "版本",hidden = true)
     private EPaymentVersion paymentVersion;
+
+
+    @ApiModelProperty("keyword 订单名称查询")
+    private String keyword;
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -139,6 +139,9 @@
             <if test="param.tenantId != null">
                 and t.tenant_id_ = #{param.tenantId}
             </if>
+            <if test="param.keyword != null and param.keyword != ''">
+                and t.order_name_ like CONCAT('%', #{param.keyword}, '%')
+            </if>
             <if test="param.paymentVersion != null">
                 and t.payment_version_ = #{param.paymentVersion}
             </if>