Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html

@@ -22,6 +22,7 @@
                                <option value="2">兑换商品</option>
                                <option value="3">完成课后练习</option>
                                <option value="4">观看教学视频</option>
                                <option value="5">启动游戏</option>
                            </#SelectCon>
                            </div>
                        <div class="col-sm-3">