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

gongchunyi

10 天以前 0907687e631c643a4cf0d41c1d2d4a645e69f0a7

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