Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r37255 -r37446 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 37255) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 37446) @@ -758,13 +758,18 @@ /** * 是否已推送(默认值为“否”)ZSWY-204 */ - public String finishPush = Constants.STR_NO; + private String finishPush = Constants.STR_NO; /** * 最后推送时间ZSWY-204 */ - public Date lastPushDateTime; + private Date lastPushDateTime; + /** + * “发货回原申请单”,选项为“是”、“否”,默认值为“否;DGSETYY-80 + */ + private String shipBackToOriginalApply = Constants.STR_NO; + @Override @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -2699,5 +2704,14 @@ public void setSterilizationPaperType(String sterilizationPaperType) { this.sterilizationPaperType = sterilizationPaperType; } + + @Column(columnDefinition=" varchar(255) default '" + Constants.STR_NO + "' not null ") + public String getShipBackToOriginalApply() { + return shipBackToOriginalApply; + } + public void setShipBackToOriginalApply(String shipBackToOriginalApply) { + this.shipBackToOriginalApply = shipBackToOriginalApply; + } + }