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

peng

9 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

 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);