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

rk

昨天 4898564fb2510dcdbe10d01eaa94886512aebc77

 server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java

@@ -56,4 +56,9 @@
    @ApiModelProperty(value = "是否已删除", hidden = true)
    private Boolean deleted;

    @ApiModelProperty(value = "模块")
    private String module;



}