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

peng

11 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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

@@ -22,14 +22,8 @@
    /** 真实姓名 */
    private String realName;

    @TableField("role")
    /** 角色 */
    private String role;

    @TableField("member_id")
    /** 会员用户id */
    private String memberId;
    /** 商户id */
    @TableField("store_id")
    private String storeId;

}