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

peng

4 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

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

@@ -26,5 +26,8 @@
    /** 附件地址 */
    private String urlPath;

    @TableField("content")
    private String content;


}