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

jinpengyong

2021-03-10 535296ad8d0482856e98f788c667f3fa72576637

 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>