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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

@@ -63,4 +63,8 @@

    @TableField(exist = false)
    private LocalDateTime createTime;

    @TableField(exist = false)
    private Boolean  isFrozen;

}