Merge branches 'f-6.7.2.5' and 'f-6.7.2.5' of 192.168.10.6:caosy/fun-admin into f-6.7.2.5

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

@@ -507,6 +507,19 @@ public class VoucherRuleController {
         nameIdBean3.setName(VoucherTypeEnum.TOUR.getMsg());
         nameIdBean3.setName(VoucherTypeEnum.TOUR.getMsg());
         nameIdBean3.setId(VoucherTypeEnum.TOUR.getValue());
         nameIdBean3.setId(VoucherTypeEnum.TOUR.getValue());
         result.add(nameIdBean3);
         result.add(nameIdBean3);
+        NameIdBean<Integer> nameIdBean4 = new NameIdBean<Integer>();
+        nameIdBean4.setName(VoucherTypeEnum.TOUR_VOUCHER.getMsg());
+        nameIdBean4.setId(VoucherTypeEnum.TOUR_VOUCHER.getValue());
+        result.add(nameIdBean4);
+        NameIdBean<Integer> nameIdBean5 = new NameIdBean<Integer>();
+        nameIdBean5.setName(VoucherTypeEnum.TRAIN_VOUCHER.getMsg());
+        nameIdBean5.setId(VoucherTypeEnum.TRAIN_VOUCHER.getValue());
+        result.add(nameIdBean5);
+        NameIdBean<Integer> nameIdBean6 = new NameIdBean<Integer>();
+        nameIdBean6.setName(VoucherTypeEnum.VIP_VOUCHER.getMsg());
+        nameIdBean6.setId(VoucherTypeEnum.VIP_VOUCHER.getValue());
+        result.add(nameIdBean6);
+        
         
         
         return result;
         return result;
     }
     }