Merge remote-tracking branch 'origin/master'

cy

2023-12-07 ba74a8c6b9e5bef2240dda9c8880bc851994f801

 consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java

@@ -46,7 +46,7 @@
    @ApiModelProperty(value = "实盘数量")
    private Integer realNum;

    @ApiModelProperty(value = "状态")
    @ApiModelProperty(value = "状态,")
    private Integer status;