Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/OrderPayReq.java

@@ -19,16 +19,18 @@ public class OrderPayReq {
     @ApiModelProperty(value = "订单号 ", required = true)
     private String orderNo;
     @NotNull(message = "支付渠道不能为空")
-    @ApiModelProperty(value = "支付渠道:  alipay 支付宝APP支付 alipay_lite 支付宝小程序支付  wx_lite 微信小程序支付 ", required = true)
+    @ApiModelProperty(value = "支付渠道:  alipay 支付宝扫码 ali_app 支付宝APP  wx_app 微信APP wx_lite 微信小程序支付", required = true)
     private PayChannelEnum payChannel;
-    @ApiModelProperty(value = "微信用户openId（微信支付必传）")
+    @ApiModelProperty(value = "微信用户openId（微信支付必传）",hidden = true)
     private String openId;
-    @ApiModelProperty(value = "买家的支付宝用户 id（支付宝小程序支付必传）")
+    @ApiModelProperty(value = "买家的支付宝用户 id（支付宝小程序支付必传）",hidden = true)
     private String buyerId;
     @ApiModelProperty(value = "用户说明 ")
     private String reason;
 
+    @ApiModelProperty(value = "用户id ",hidden = true)
     private Long userId;
+    @ApiModelProperty(value = "用户ip ",hidden = true)
     private String ipAddress;
 
     public String getOrderNo() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -32,7 +32,10 @@ public class OrderSearch extends QueryInfo{
 	@ApiModelProperty("查询时间（yyyy-mm） ")
 	private String searchDate;
 
+
+	@ApiModelProperty(hidden = true)
 	private String goodType;
+	@ApiModelProperty(hidden = true)
 	private Long bizId;
 
 	public String getSearchNo() {