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

rk

5 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 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;



}