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

liyong

21 小时以前 60806825951c111ac107dec87bd3acc5a7d6a707

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

@@ -63,4 +63,12 @@

    @TableField(exist = false)
    private LocalDateTime createTime;

    @TableField(exist = false)
    private Long parentId;

    @TableField(exist = false)
    private String parentName;

    private Long productType;
}