Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 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>