Merge remote-tracking branch 'origin/master'

xiejun

2023-10-19 8b73e9cbdf4035ef1aa1026c979222a7e4ca5e01

 Source/UBCS-WEB/src/option/user/info.js

@@ -17,7 +17,7 @@
          text: ' ',
          ratio: 0.1
        },
        action: '/api/blade-resource/oss/endpoint/put-file',
        action: '/api/ubcs-resource/oss/endpoint/put-file',
        tip: '只能上传jpg/png用户头像，且不超过500kb',
        span: 12,
        row: true,
@@ -45,7 +45,7 @@
      }]
    },
    {
      label: '修改密码',
      label: '',
      prop: 'password',
      column: [{
        label: '原密码',