Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java

@@ -179,6 +179,7 @@
        QueryWrapper<ManageRole> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        wrapper.like("name",map.get("name"));
        wrapper.orderByDesc("create_time");
        com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
        List<ManageRole> manageRoles = resultpage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");