Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpWarehouseServiceImpl.java

@@ -78,8 +78,8 @@ public class WtSpWarehouseServiceImpl extends BaseServiceImpl<WtSpWarehouseMappe
             warehouseVO.setAffiliatedUnit(entity.getAffiliatedUnit());
             warehouseVO.setAffiliatedName(entity.getAffiliatedName());
             warehouseVO.setCreateDept(entity.getCreateDept());
-            if(null!=entity.getCreateUser()){
+            if(null!=entity.getManager()){
-				User manager = userClient.userInfoById(entity.getCreateUser()).getData();
+				User manager = userClient.userInfoById(entity.getManager()).getData();
                 warehouseVO.setManagerName(ObjectUtil.isNotEmpty(manager) ? manager.getName() : null);
             }
             warehouseVO.setStatus(entity.getStatus());