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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -70,5 +70,6 @@
    @TableField(exist = false)
    private String parentName;

    @TableField(exist = false)
    private Long productType;
}