Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java =================================================================== diff -u -r20050 -r20060 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java (.../HrpTousseItem.java) (revision 20050) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java (.../HrpTousseItem.java) (revision 20060) @@ -32,12 +32,18 @@ /** * 物质编码 */ - private String InventorySerialNumber; + private String inventorySerialNumber; /** * 数量 */ private Long amount; + public String getInventorySerialNumber() { + return inventorySerialNumber; + } + public void setInventorySerialNumber(String inventorySerialNumber) { + this.inventorySerialNumber = inventorySerialNumber; + } public long getId() { return id; } @@ -74,12 +80,6 @@ public void setPrice(Double price) { this.price = price; } - public String getInventorySerialNumber() { - return InventorySerialNumber; - } - public void setInventorySerialNumber(String inventorySerialNumber) { - InventorySerialNumber = inventorySerialNumber; - } public Long getAmount() { return amount; } Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java =================================================================== diff -u -r20050 -r20060 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 20050) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 20060) @@ -2,7 +2,8 @@ import java.util.ArrayList; import java.util.Collection; -import java.sql.Date; +import java.util.Date; + /** * zszy一次性物品申请单 */