DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

병합 누락 수정

master
강석 최 2023-01-04 09:16:39 +09:00
parent 1fea481725
commit a576faa1cb
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java
View File

@ -1,12 +1,8 @@
package com.dbnt.faisp.main.counterIntelligence.mapper; package com.dbnt.faisp.main.counterIntelligence.mapper;
<<<<<<< HEAD
import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics; import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics;
=======
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
>>>>>>> f44d4498869b8f15bd214aeb366c9304b59ff7a6
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;

3
src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java
View File

@ -3,11 +3,8 @@ package com.dbnt.faisp.main.counterIntelligence.service;
import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.BaseService;
import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.config.FileInfo;
import com.dbnt.faisp.main.counterIntelligence.mapper.CounterIntelligenceMapper; import com.dbnt.faisp.main.counterIntelligence.mapper.CounterIntelligenceMapper;
<<<<<<< HEAD
import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics; import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics;
=======
import com.dbnt.faisp.main.counterIntelligence.model.CiaFile; import com.dbnt.faisp.main.counterIntelligence.model.CiaFile;
>>>>>>> f44d4498869b8f15bd214aeb366c9304b59ff7a6
import com.dbnt.faisp.main.counterIntelligence.model.CiwFile; import com.dbnt.faisp.main.counterIntelligence.model.CiwFile;
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;

2
src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
View File

@ -174,5 +174,5 @@
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
)a )a
</select> </select>
</mapper> </mapper>