Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -960,7 +960,7 @@
                </if>
                <if
                        test="(record.suName!=null and record.suName!='') or (record.suName!='' and record.suName==0)">
                    and su_name like concat('%',#{record.suName},'%')
                    and (su_name like concat('%',concat(#{record.suName},'%')) or su_tel = #{record.suName})
                </if>
                <if
                        test="(record.suTel!=null and record.suTel!='') or (record.suTel!='' and record.suTel==0)">
@@ -1318,5 +1318,7 @@
   where id=#{id}
   </update>


    <select id="selectAppVersion" resultType="com.matrix.system.hive.bean.AppVersion">
        select * from app_version
    </select>
</mapper>