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

peng

9 天以前 b83b070dc8cc823c877aa3a2ade134272ec0641a

 framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java

@@ -10,6 +10,7 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;

/**
 * 会员修改
@@ -54,4 +55,6 @@

    @ApiModelProperty(value = "会员头像")
    private String face;

    private List<String> tags;
}