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

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

 src/main/webapp/static/js/plan/plan.js

@@ -286,7 +286,10 @@
        var file = _uploadFile
        $("#upload-file-id-" + file.lastModified).html("上传中")

        putObject(file).then((result) => {
        putObject(file,(p) => {
            // console.log(p)
            $("#upload-file-id-" + file.lastModified).html("上传中：" + (Math.round(p * 100)) + "%")
        }).then((result) => {
            var filename = result.name
            layer.msg('上传成功', {icon: 1});
            $("#upload-file-id-" + file.lastModified).html("上传成功")