Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -12,6 +12,8 @@
                        <div class="row">
                            <div class="col-lg-10 col-sm-9">
                                <div class="row">
                                    @if(objectType==1){

                                    <div class="col-lg-4 col-sm-12" ${objectType == 3 ? 'style="display: none;"' : ''}>
                                        <#SelectCon id="provinceCode" name="所在省">
                                            <option value="">全部</option>
@@ -25,6 +27,7 @@
                                            <option value="">全部</option>
                                        </#SelectCon>
                                    </div>
                    @}
                                    <div class="col-lg-4 col-sm-12">
                                        <#SelectCon id="coursePackageTypeId" name="课包类型">
                                            <option value="">全部</option>