Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-admin into f-6.7.0

src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java

@@ -216,6 +216,7 @@ public class VoucherRuleController {
         if (!StringUtils.isEmpty(resourceIds)) {
             vo.setResourceIds(resourceIds.replace("，", ","));
         }
+        vo.setEndUseDate(DateUtil.getEndTime4Day(vo.getEndUseDate()));
         boolean modifyVoucherRule = voucherRuleService.modifyVoucherRule("", vo);
         String message = modifyVoucherRule ? "现金券修改成功!" : "现金券修改失败!";
         redirectAttributes.addFlashAttribute(FlashMessageDirective.FLASH_MESSAGE_ATTRIBUTE_NAME,

src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl

@@ -558,9 +558,8 @@ function getResourceList(page){
             <td style="text-align:left">有效期</td>
             
             <td style="text-align:left">
-            	<input type="text" id="startUseDate"  name="startUseDate" value="${dto.startUseDate?string("yyyy-MM-dd")}" placeholder="${dto.startUseDate?string("yyyy-MM-dd")}" class="input-medium datetime">
-				~
-				<input type="text" id="endUseDate" name="endUseDate" value="${dto.endUseDate?string("yyyy-MM-dd")}" placeholder="${dto.endUseDate?string("yyyy-MM-dd")}" class="input-medium datetime">
+                <@form.textInputTwoDate path1="dto.startUseDate" path2="dto.endUseDate" attributes="" label="" required = true/>
+
             </td>
         </tr>
         <#if dto.voucherRuleType == 2>