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

peng

8 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

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

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

    @NotBlank
    private String id;

}