Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

 src/main/resources/mapper/UserLoginMapper.xml

@@ -8,6 +8,7 @@
        <result column="user_id" property="userId" />
        <result column="token" property="token" />
        <result column="create_time" property="createTime" />
        <result column="system" property="system" />

    </resultMap>