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

kaiyu

2021-05-24 52f100ec7860c781c1b44259c6c54b221a30c100

 screen-manage/src/main/java/com/moral/api/mapper/TestMapper.java

@@ -1,7 +1,7 @@
package com.moral.api.mapper;

import com.moral.api.entity.Test;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.Test;

/**
 * <p>