Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/member/entity/vo/ClerkVO.java

@@ -36,6 +36,8 @@
    @ApiModelProperty(value = "用户拥有的权限")
    private List<StoreMenu> menus;

    /** 真实姓名*/
    private String realName;

    public ClerkVO(Clerk clerk) {
        BeanUtil.copyProperties(clerk, this);