xzx.git - Gitblit

main / xzx

summary
reflog
commits
tree
docs
forks
compare

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-02 a3e62581af85d8a7ecece3c446c499d12d3905dc

 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml

@@ -32,7 +32,7 @@
            and d.username like concat('%',#{record.jwyName},'%')
        </if>
        <if test="record.account != null and record.account != ''">
            and ( b.nick_name like concat('%',#{record.account},'%')
            and ( a.username like concat('%',#{record.account},'%')
                      or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
        </if>
        <if test="record.reserveTimeStart != null">

			@@ -32,7 +32,7 @@
			and d.username like concat('%',#{record.jwyName},'%')
			</if>
			<if test="record.account != null and record.account != ''">
			and ( b.nick_name like concat('%',#{record.account},'%')
			and ( a.username like concat('%',#{record.account},'%')
			or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
			</if>
			<if test="record.reserveTimeStart != null">