Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 bd953391a74b86db829df43992c7cf3c5207634b

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

@@ -34,4 +34,6 @@
    @ApiModelProperty(value = "实验id 前端忽略")
    private List<String> dispatchIds;

    private Integer roleType;

}