Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html

@@ -92,6 +92,12 @@
        }else{
            $("#t3").show()
        }
        var page = $('#page option:selected').text();
        if (page=="线上课得积分" || page=="看视频得奖励"){
            if (oneId == "列表"){
                $("#t3").show()
            }
        }
    }

    function updateType(e) {