Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

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

@@ -25,4 +25,7 @@
    @ApiModelProperty(value = "微信调起业务")
    private Object response;

    @ApiModelProperty(value = "锁定编号",hidden = true)
    private String lockKey;

}