Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-02 a4cf762a08f967f627983beee129a91de815f338

 ycl-server/src/main/resources/mapper/system/SysUserMapper.xml

@@ -192,7 +192,6 @@
          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
          <if test="remark != null">remark = #{remark},</if>
           <if test="firstLogin !=null ">first_login = #{firstLogin}</if>
          update_time = sysdate()
       </set>
       where user_id = #{userId}
   </update>