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

xiaoyong931011

2021-07-23 7870947c3dc93f6d8b2db718eab551edfc709f9b

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

@@ -24,7 +24,7 @@
            1=1
            <if test="record.name != null and record.name != ''">
                and (username like concat('%',#{record.name},'%')
                or phone like concat('%',#{record.phone},'%') )
                or mobile like concat('%',#{record.name},'%') )
            </if>
            <if test="record.isJhy != null and record.isJhy != ''">
                and is_jhy=#{record.isJhy}