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

houruijun

2020-08-13 d526d571cbe0a950e777fb325978d72f3ddb302b

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

@@ -1,9 +1,13 @@
package com.kidgrow.usercenter.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.List;

@Data
public class SysDoctorDto extends  SysDoctorVo {
    private String username;
    private String password;
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private List<Long> roles;
}