yinruoxi

修改：
  1.快递外卖代码冲突

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/manager/impl/DmModelManager.java

@@ -74,8 +74,6 @@ public class DmModelManager extends BaseManagerImpl<DmModelQuery, DmModelDto, Dm
     @Autowired
     DmH5MenuMapper h5MenuMapper;
 
-    @Autowired
-    DmH5MenuMapper h5MenuMapper;
 
     @Autowired
     DmScreenIconConverter screenIconConverter;
@@ -368,18 +366,4 @@ public class DmModelManager extends BaseManagerImpl<DmModelQuery, DmModelDto, Dm
         return resultInt;
     }
 
-
-    @Override
-    public List<DmH5MenuDto> selectCustomH5MenuList() {
-        List <DmH5MenuPo> h5MenuPos = h5MenuMapper.selectList(null);
-        List<DmH5MenuDto> result = new ArrayList<>();
-        for (DmH5MenuPo po : h5MenuPos) {
-            DmH5MenuDto dto = new DmH5MenuDto();
-            dto.setId(po.getId());
-            dto.setMenuType(po.getMenuType());
-            dto.setTitle(po.getTitle());
-            result.add(dto);
-        }
-        return result;
-    }
 }