添加卷规则过期时间筛选

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

@@ -18,6 +18,7 @@
     <@com.singleSelectQuery "dto.status" enums["com.ctrip.fun.common.vo.basic.VoucherRuleStatusEnum"] "" "现金券状态"/>
     <@com.textInput "dto.id" "style=\"margin-left: 5px;\"" "现金券ID"/>
     <@com.textInput "dto.description" "style=\"margin-left: 5px;\"" "现金券名称"/>
+    <@com.textInputTwoDate "dto.endUseDateStart" "dto.endUseDateEnd" "style=\"margin-left: 5px;\"" "过期时间"/>
     <@com.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/>
     <button type="submit" class="btn btn-primary">查询</button>
     <button type="button" class="btn btn-success" onclick="javascript:location.href='/voucherRule/queryList';" style="margin-left:20px;">重置</button>
@@ -28,6 +29,7 @@
         <th style="width:5%">ID</th>
         <th style="width:20%">描述</th>
         <th style="width:15%">发放时间</th>
+       	<th style="width:15%">到期时间</th>
         <th style="width:5%">张数</th>
         <th style="width:5%">金额</th>
         <th style="width:5%">人数</th>
@@ -44,6 +46,7 @@
             <td>${item.id!}</td>
             <td style="text-align:left">${item.description!}</td>
             <td>${item.createdTime?string("yyyy-MM-dd HH:mm:ss")}</td>
+            <td>${item.endUseDate?string("yyyy-MM-dd HH:mm:ss")}</td>
             <td style="text-align:left">${item.quantityAll!}</td>
             <td>${item.amountAll!}</td>
             <td>${item.countUser!}</td>