Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
This commit is contained in:
		| @@ -141,7 +141,7 @@ | ||||
|                 and (sc.name like concat('%',#{customer},'%') or sc.phone like concat('%',#{customer},'%')) | ||||
|             </if> | ||||
|              <if test="cusId != null  and cusId != ''">and cus_id = #{cusId}</if> | ||||
|             <if test="phone != null  and phone != ''">and phone = #{phone}</if> | ||||
|             <if test="phone != null  and phone != ''">and sc.phone = #{phone}</if> | ||||
|             <if test="status != null ">and status = #{status}</if> | ||||
|             <if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if> | ||||
|             <if test="preSaleId != null ">and pre_sale_id = #{preSaleId}</if> | ||||
|   | ||||
| @@ -118,6 +118,7 @@ | ||||
|             <if test="orderId != null">order_id = #{orderId},</if> | ||||
|             <if test="cusId != null">cus_id = #{cusId},</if> | ||||
|             <if test="outId != null">out_id = #{outId},</if> | ||||
|             <if test="recipesId != null">recipes_id = #{recipesId},</if> | ||||
|             <if test="startDate != null">start_date = #{startDate},</if> | ||||
|             <if test="endDate != null">end_date = #{endDate},</if> | ||||
|             <if test="startNumDay != null">start_num_day = #{startNumDay},</if> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user