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

peng

5 天以前 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

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

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

    @NotBlank
    private String id;

}