Merge branch 'developer'

Helius

2022-03-03 cf9bfc85093d4b7e5573422b8fd1a55c459b0d34

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -61,6 +61,7 @@
        <result property="country" column="country" />
        <result property="sessionKey" column="session_key" />
        <result property="userIsAuthorize" column="user_is_authorize" />
        <result property="validFlag" column="valid_flag" />

        <!-- 扩展属性 -->
        <result property="staffName" column="STAFF_NAME"/>
@@ -124,6 +125,7 @@
        <result property="country" column="country" />
        <result property="sessionKey" column="session_key" />
        <result property="userIsAuthorize" column="user_is_authorize" />
        <result property="validFlag" column="valid_flag" />

        <!-- 扩展属性 -->
        <result property="staffName" column="STAFF_NAME"/>
@@ -537,6 +539,9 @@
            <if test="avatarUrl != null and avatarUrl != '' ">
                avatar_url  = #{avatarUrl},
            </if>
            <if test="validFlag != null and validFlag != '' ">
                valid_flag  = #{validFlag},
            </if>


        </set>