Merge remote-tracking branch 'origin/master'

44323

2023-10-16 865fc8d02e44811fb423df7125055c3a85e38964

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

@@ -85,7 +85,7 @@
                <label class="col-sm-3 control-label">举办门店：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="shopId" name="shopId" multiple>
                        <option value="">选择门店</option>

                    </select>
                </div>
            </div>
@@ -267,6 +267,8 @@
        created() {
        },
    });


    laydate.render({
        elem: '#endTime'
        ,type:"date"