Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-22 7c220e1e14cb099ac6b7f08b911b037b79cf9da8

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -224,6 +224,7 @@
          <if test="loginDate != null">login_date = #{loginDate},</if>
          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
          <if test="remark != null">remark = #{remark},</if>
         <if test="forbiddenRemark != null">forbidden_remark = #{forbiddenRemark},</if>
          update_time = sysdate()
       </set>
       where user_id = #{userId}