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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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

@@ -37,6 +37,7 @@
    private String userName;
    private boolean defaultAuth;
    private boolean enabled;
    private boolean isDel;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
}