Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

zhibing.pu

2024-07-25 01d8de48c76467ff3b99b204e66d3ef86506fa52

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -440,16 +440,7 @@
                                                        name="zc1" id="content6Num3" class="form-control newWidth"  readonly/> 
                                    <br/>
                                    <br/>
                                    有效期：
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"

                                                 @if(isNotEmpty(item5Red)){
                                                 value="${item5Red.effective}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc1" id="content6Num4" class="form-control newWidth" readonly/>&nbsp;天
                                    最高金额：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="text"
                                                                              @if(isNotEmpty(item5)){
                                                                              value="${item5.totalPrice}"
@@ -463,6 +454,7 @@
                    </div>
                </div>
            </div>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">