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

zxl

1 天以前 c4786844ef75025cd27cc3833a0f7cd86ad80781

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/GoodsCustomizeTemplate.java

@@ -22,7 +22,10 @@
    private String templateName;

    @TableField("status")
    /** 启用状态 */
    /**
     * 启用状态
     * @see cn.lili.modules.lmk.enums.general.EnableStatusEnums
     */
    private String status;