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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

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