Merge branch 'master' of https://www.iformall.com/mall/formallProject

mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java

@@ -31,6 +31,9 @@ public class WxCouponController extends BaseController
     	  @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
     public ResultData list(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) {
     	if (null == wxCoupon) wxCoupon = new WxCoupon();
+    	if(wxCoupon.getType()!=null&&wxCoupon.getType()==-1){
+            wxCoupon.setType(null);
+        }
         final PageInfo<WxCoupon> page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);
         return new ResultData(page);
     }