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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/java/doumeemes/dao/ext/beanDto/QueryWStockDto.java

@@ -80,5 +80,7 @@
    @ApiModelProperty(value = "工单主键")
    private Integer workorderId;

    @ApiModelProperty(value = "工序计划主键")
    private Integer plansId;

}