Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17

yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryTypeController.java

@@ -78,8 +78,8 @@ public class MesDvMachineryTypeController {
         List<MesDvMachineryTypeDO> list = machineryTypeService.getMachineryTypeList(
                 new MesDvMachineryTypeListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
         return success(convertList(list, machineryType -> new MesDvMachineryTypeRespVO()
-                .setId(machineryType.getId()).setName(machineryType.getName())
-                .setParentId(machineryType.getParentId())));
+                .setId(machineryType.getId()).setName(machineryType.getName()).setParentId(machineryType.getParentId())
+                .setCode(machineryType.getCode()).setRemark(machineryType.getRemark())));
     }
 
 }