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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js

@@ -282,13 +282,12 @@
        data: JSON.stringify(data),
        contentType: "application/json",
        success: function (response) {
            if (response === 500){
            if (!response){
                Feng.error("所选视频已经存在于当前福利视频分类下！");
                window.parent.TQuestion.table.refresh();
                TQuestion.close();

            }else{
                Feng.success("添加成功");
                window.parent.TQuestion.table.refresh();
                TQuestion.close();
            }
        },
        error: function (xhr, status, error) {
@@ -314,7 +313,13 @@
        data: JSON.stringify(data),
        contentType: "application/json",
        success: function (response) {
            Feng.success("添加成功");
            if (!response){
                Feng.error("所选视频已经存在于当前福利视频分类下！");
            }else{
                Feng.success("编辑成功");
                window.parent.TQuestion.table.refresh();
                TQuestion.close();
            }
        },
        error: function (xhr, status, error) {
            Feng.error("添加失败！" + error);