Merge remote-tracking branch 'origin/master'

mitao

昨天 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

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

@@ -9,7 +9,7 @@
@ApiModel(value = "审批详情通用query")
public class ApprovalDetailQuery extends BasePage {

    @ApiModelProperty(value = "待办id")
    @ApiModelProperty(value = "申请单id")
    private Integer id;

    @ApiModelProperty(value = "申请单id 前端忽略")