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

liding

3 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

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