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

zxl

昨天 c4786844ef75025cd27cc3833a0f7cd86ad80781

 framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java

@@ -16,4 +16,7 @@
    /** 子模板值*/
    private String value;

    /** 子模板类型*/
    private String contentType;

}