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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js

@@ -241,7 +241,7 @@
$(function () {
    var defaultColunms = TCompetition.initColumn();
    var table = new BSTable(TCompetition.id, "/tCompetition/listUser/"+$("#id").val(), defaultColunms);
    table.setPaginationType("client");
    table.setPaginationType("server");
    TCompetition.table = table.init();
});