Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js

@@ -35,7 +35,10 @@
        },
        {title: '操作', visible: role==1?true:false, align: 'center', valign: 'middle',
            formatter:function (value,row) {
                return '<a href="javascript:void(0);" style="color: blue" onclick="TCompetition.delete1(' + row.id +')">删除 </a>  <a href="javascript:void(0);" style="color: blue" onclick="TCompetition.openTCompetitionDetail(' + row.id +')">编辑</a>'
                return '<a href="javascript:void(0);" style="color: blue" ' +
                    'onclick="TCompetition.delete1(' + row.id +')">删除 </a>  ' +
                    '<a href="javascript:void(0);" style="color: blue" ' +
                    'onclick="TCompetition.openTCompetitionDetail(' + row.id +')">编辑</a>'
            }
        },
    ];