Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml

@@ -272,6 +272,10 @@
    AND waster = '1'
    AND project = #{project};
    </select>
    <select id="getUserByArp" resultMap="SysUser">
        select * from sys_user
        where arp = #{0} and valid_flag = 1
    </select>
    <update id="updateUserPointBySelective" parameterType="java.util.Map">
    update sys_user set point=#{point}
    <where>