Merge remote-tracking branch 'origin/master'

rk

昨天 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/PayResponse.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "支付订单主键")
    private Integer orderId;

    @ApiModelProperty(value = "支付类型：0=现金支付；1=纯积分支付")
    private Integer payType;

    @ApiModelProperty(value = "微信调起业务")
    private Object response;