Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js

@@ -24,7 +24,7 @@
        {title: '玩湃币数量', field: 'playPaiCoins', visible: true, align: 'center', valign: 'middle'},
        {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle',
            formatter:function (data) {
                return {1:"会员充值",0:"非会员充值"}[data]
                return {1:"会员充值",2:"非会员充值"}[data]
            }
        },
    ];