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

luliqiang

2020-06-12 abee95ff7de4b3514022b758044e77793f74896f

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java

@@ -49,4 +49,5 @@
     */
    @NotEmpty(message = "状态，1启用，0停用不能为空")
    private Integer enabled;

}