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

Pu Zhibing

2025-06-16 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsPageDto.java

@@ -28,4 +28,8 @@

    @ApiModelProperty(value = "创建时间")
    private String createEndTime;

    @ApiModelProperty(value = "商品状态-1删除1上架2下架")
    private Integer goodsStatus;

}