Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-22 f9fff682ff6b21344401bb86f85d25c97c37b073

 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}"