diff --git a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java index b3df41b4..7f9faebe 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java @@ -127,5 +127,7 @@ public class DeviceReceiveOrderResponse { private String auditUserName; + private Integer type; + } diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml index d5a7fa87..ddd10ca5 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml @@ -13,6 +13,7 @@ dro.STATUS, dro.fromInvSpaceCode, dro.receiveUser, + dro.type, au.employeeName as receiveUserName, aur.employeeName as auditUserName, ( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,