Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java

@@ -60,6 +60,11 @@ public class DeviceReceiveOrderResponse {
      */
     private String createUser;
 
+    /**
+     * 创建人
+     */
+    private String createUserName;
+
     /**
      * 审核人
      */

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -18,7 +18,8 @@
         ( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode,
         ( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
         ( SELECT `code` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvCode,
-        ( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName
+        ( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName,
+        ( SELECT employeeName FROM auth_user WHERE userName = dro.createUser ) createUserName
         FROM
         device_receive_order dro
         <where>

src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml

@@ -23,7 +23,7 @@
                (select employeeName from auth_user where id = t.createUser) createUserName,
                (select employeeName from auth_user where id = t.auditUser)  auditUserName,
                (select `name` from auth_dept where code = t.deptCode)       deptName,
-               (select `name` from auth_warehouse where code = t.invCode)   invCode,
+               (select `name` from auth_warehouse where code = t.invCode)   invName,
                t1.deviceName,
                t1.ggxh,
                t1.batchNo