Commit c30955605704af1619d36c753de440f35c724679
Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
Showing
1 changed file
with
2 additions
and
2 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryTypeController.java
| @@ -78,8 +78,8 @@ public class MesDvMachineryTypeController { | @@ -78,8 +78,8 @@ public class MesDvMachineryTypeController { | ||
| 78 | List<MesDvMachineryTypeDO> list = machineryTypeService.getMachineryTypeList( | 78 | List<MesDvMachineryTypeDO> list = machineryTypeService.getMachineryTypeList( |
| 79 | new MesDvMachineryTypeListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); | 79 | new MesDvMachineryTypeListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); |
| 80 | return success(convertList(list, machineryType -> new MesDvMachineryTypeRespVO() | 80 | return success(convertList(list, machineryType -> new MesDvMachineryTypeRespVO() |
| 81 | - .setId(machineryType.getId()).setName(machineryType.getName()) | ||
| 82 | - .setParentId(machineryType.getParentId()))); | 81 | + .setId(machineryType.getId()).setName(machineryType.getName()).setParentId(machineryType.getParentId()) |
| 82 | + .setCode(machineryType.getCode()).setRemark(machineryType.getRemark()))); | ||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | } | 85 | } |