Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

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

@@ -65,7 +65,7 @@
                    <label class="col-sm-3 control-label">所属门店：</label>
                    <div class="col-sm-9">
                        <select class="form-control" id="storeId" name="storeId">
                            <option value="">${item.name}</option>
                            <option value="">${shopName}</option>
                        </select>
                    </div>
                </div>
@@ -92,7 +92,9 @@
                    <label class="col-sm-3 control-label">课时数：</label>
                    <div class="col-sm-9">
                        <select class="form-control" id="coursePackageConfigId" name="coursePackageConfigId">
                            <option value="">${classHours}</option>
                            @for(obj in classHours){
                            <option value="">${obj}</option>
                            @}
                        </select>
                    </div>
                </div>
@@ -166,6 +168,18 @@
                        <input class="form-control" id="pickUpQuantity1" name="pickUpQuantity" type="text" value="${item.pickUpQuantity}" readonly>
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">已领数量：</label>
                    <div class="col-sm-9">
                        <input class="form-control" id="pickUpQuantity3" name="pickUpQuantity" type="text" value="${item.pickUpQuantity3}" readonly>
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">已兑换数量：</label>
                    <div class="col-sm-9">
                        <input class="form-control" id="pickUpQuantity4" name="pickUpQuantity" type="text" value="${item.pickUpQuantity4}" readonly>
                    </div>
                </div>
                <#input id="startTime1" name="有效期" type="text" value="${sTime} - ${eTime}" readonly="true"/>

                <div class="form-group" style="margin-left:262px">