Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-18 7ee1dcc2d059680ca05987490cd419077e34b02f

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -265,7 +265,7 @@
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            ,update_time=sysdate()
        </set>
        where id= #{id}
        where user_id= #{userId}
    </update>

    <delete id="deleteConfigById" parameterType="string">