Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -324,4 +324,6 @@
    private Date newEnd;
    @TableField(exist = false)
    private String newABCTag;
    @TableField(exist = false)
    List<EquipmentSpares> equipmentSparesList;
}