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

maven

2026-03-19 3f1d871318231ebabb3be06c4ca2ca770b5b0220

 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;
}