Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

2 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java

@@ -16,7 +16,5 @@
    /** 是否取消*/
    private Boolean cancel;

    @NotBlank
    private String id;

}