Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-28 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb

 cloud-server-management/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -342,23 +342,11 @@
            }
            return;
        }
          if(language==1){
            Feng.success("添加成功!");
        }else if(language==2){
            Feng.success("Successfully added!");
        }else {
            Feng.success("Sangat berhasil ditambah!");
        }
          Feng.success("添加成功!");
        window.parent.Franchisee.table.refresh();
        FranchiseeInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("添加失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to add!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
        }
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
    ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
    if (checkbox1){
@@ -598,23 +586,11 @@
            }
            return;
        }
        if(language==1){
            Feng.success("修改成功!");
        }else if(language==2){
            Feng.success("Modify successfully!");
        }else {
            Feng.success("Mengubah dengan sukses!");
        }
        Feng.success("修改成功!");
        window.parent.Franchisee.table.refresh();
        FranchiseeInfoDlg.close();
    },function(data){
        if(language==1){
            Feng.error("修改失败!" + data.responseJSON.message + "!");
        }else if(language==2){
            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
        }else {
            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
        }
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set(FranchiseeInfoDlg.franchiseeInfoData);
    if (checkbox1){