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

zhaoxiaohao

2020-08-08 4d9483cecdeb9e13a7ea4475121351b02058a51b

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/SysDoctorDto.java

@@ -2,8 +2,11 @@

import lombok.Data;

import java.util.List;

@Data
public class SysDoctorDto extends  SysDoctorVo {
    private String username;
    //private String username;
    private String password;
    private List<Long> roles;
}