Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java

@@ -31,5 +31,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime = new Date();

    private Integer version;
    private Integer version = 1;
}