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

doum

6 天以前 6525935588f4b9a06e08f91dfc9d2895e5ec2c38

 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;



}