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

Helius

2021-07-15 bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed

 gc-user/src/main/resources/mapper/user/AccountMapper.xml

@@ -191,7 +191,7 @@
            <if test="record.phone != null and record.phone != ''">
                and b.mobile_phone like concat('%',#{record.phone},'%')
            </if>
            <if test="record.phone != null and record.phone != ''">
            <if test="record.isProhibit != null and record.isProhibit != ''">
                and  a.is_prohibit = #{record.isProhibit}
            </if>
            <if test="record.reserveTimeStart != null">