Merge branch 'score_shop' into api_score_meger

jyy

2021-07-10 3213b15129d5d7cb63df8f197fbc8f7793ae3a03

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

@@ -323,7 +323,7 @@
        <set>
            update_time=now(),
            <if test="updateBy!=null">
                update_by = #{btnKey},
                update_by = #{updateBy},
            </if>
            <if
                    test="(suName!=null and suName!='') or (suName!='' and suName==0)">