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

kaiyu

2021-06-18 4ad67c20b9c5e6625babefeee59ccee155cfc3aa

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

@@ -2,8 +2,8 @@

import com.moral.api.entity.ManageLog;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.system.ManageLogQueryDTO;
import com.moral.api.pojo.form.system.ManageLogQueryForm;
import com.moral.api.pojo.dto.manageLog.ManageLogQueryDTO;
import com.moral.api.pojo.form.manageLog.ManageLogQueryForm;

/**
 * <p>