Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r12721 -r12968 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 12721) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 12968) @@ -1,18 +1,13 @@ package com.forgon.disinfectsystem.entity.assestmanagement; import java.text.SimpleDateFormat; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; import javax.persistence.Transient; import org.apache.commons.lang.StringUtils; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java =================================================================== diff -u -r12901 -r12968 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java (.../DisposableGoodsBatchStock.java) (revision 12901) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java (.../DisposableGoodsBatchStock.java) (revision 12968) @@ -4,7 +4,6 @@ import java.util.Comparator; import java.util.Date; import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -15,12 +14,9 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Transient; - import org.hibernate.annotations.Cascade; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.forgon.Constants; -import com.forgon.directory.model.BarcodeDevice; /** * @author JamZhou Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java =================================================================== diff -u -r12721 -r12968 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java (.../DisposableGoodsBatch.java) (revision 12721) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java (.../DisposableGoodsBatch.java) (revision 12968) @@ -1,21 +1,12 @@ package com.forgon.disinfectsystem.entity.assestmanagement; -import java.util.ArrayList; import java.util.Comparator; import java.util.Date; -import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Entity; -import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Transient; - -import org.hibernate.annotations.Cascade; - -import com.fasterxml.jackson.annotation.JsonIgnore; import com.forgon.Constants; import com.forgon.directory.model.BarcodeDevice;