Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -47,6 +47,7 @@
            <div class="row">
                <input type="hidden" id="id" value="${item.id}">
                <input type="hidden" id="type" name="type" value="${type}">
                @if(type==1){
                <div class="form-group">
                    <label class="col-sm-3 control-label">*所在省：</label>
                    <div class="col-sm-4">
@@ -67,6 +68,7 @@
                        </select>
                    </div>
                </div>
                @}
                <div class="form-group">
                    <label class="col-sm-3 control-label">*所属门店：</label>
                    <div class="col-sm-4">