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

zj

2024-08-21 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65

 src/main/resources/mapper/UserMapper.xml

@@ -36,6 +36,9 @@
  </sql>


    <select id="findByPhone" parameterType="string" resultType="com.nq.pojo.User">
        select * from user where phone= #{phone}
    </select>

    <select id="login" resultMap="BaseResultMap" parameterType="map">
        SELECT