Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r21717 -r21794 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 21717) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 21794) @@ -65,6 +65,12 @@ * 如果为使用记录转换的申请单,则申请人为最后一条使用记录转换的申请人(操作人) */ private String applicant; + + /** + * 申请人编码(这个字段,目前为止只有高值耗材有赋值,其他申请单类型为空,暂时别用,我抽空把其他申请单类型也赋值-cjr) + * 如果为使用记录转换的申请单,则申请人为最后一条使用记录转换的申请人(操作人) + */ + private String applicantCode; /** * 申请时间,是指申请单第一次提交订单的时间,不是暂存的时间,也不是最后的修改时间。 @@ -1095,4 +1101,12 @@ return SupplyRoomConfigUtils.getDisposableGoodsFluctuationPriceDouble( disposablePriceFluctuation, price); } + + public String getApplicantCode() { + return applicantCode; + } + + public void setApplicantCode(String applicantCode) { + this.applicantCode = applicantCode; + } } Index: forgon-core/src/main/java/com/forgon/security/model/User.java =================================================================== diff -u -r16365 -r21794 --- forgon-core/src/main/java/com/forgon/security/model/User.java (.../User.java) (revision 16365) +++ forgon-core/src/main/java/com/forgon/security/model/User.java (.../User.java) (revision 21794) @@ -67,8 +67,14 @@ private String objectGUID; + /** + * 用户登录名(即:工号) + */ private String name; + /** + * 用户的全名 + */ private String fullName; private String dept;