Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-17 d0b043b8fa5f19d1295cac50fece0c65fceb3920

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java

@@ -163,6 +163,10 @@
     */
    @TableField(exist = false)
    private String isAsc;
    @TableField(exist = false)
    private Integer pageNum;
    @TableField(exist = false)
    private Integer pageSize;


    public String getIdStr() {