Merge branch 'send_coupon' into user_action

peng

2 天以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

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

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

    @NotBlank
    private String id;

}