Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 ruoyi-system/src/main/java/com/ruoyi/system/query/TSysProductIntroductionQuery.java

@@ -21,4 +21,7 @@

    @ApiModelProperty(value = "角色类型")
    private Integer roleType;

    @ApiModelProperty(value = "用户id")
    private Long userId;
}