Commit 6c99dd9d authored by sml's avatar sml

冲突解决

parent 1d6e4105
...@@ -3,7 +3,6 @@ package com.jz.dmp.modules.dao; ...@@ -3,7 +3,6 @@ package com.jz.dmp.modules.dao;
import com.jz.common.persistence.CrudDao; import com.jz.common.persistence.CrudDao;
import com.jz.dmp.modules.model.DmpProject; import com.jz.dmp.modules.model.DmpProject;
import com.jz.dmp.modules.model.DmpProjectSystemInfo; import com.jz.dmp.modules.model.DmpProjectSystemInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -32,6 +31,13 @@ public interface DmpProjectDao extends CrudDao<DmpProject> { ...@@ -32,6 +31,13 @@ public interface DmpProjectDao extends CrudDao<DmpProject> {
public List<DmpProjectSystemInfo> getProjectSystemInfo(Long projectId); public List<DmpProjectSystemInfo> getProjectSystemInfo(Long projectId);
/**
* 根据projectId查询项目系统配置信息
*
* @return
* @author Bellamy
* @since 2021-01-08
*/
DmpProjectSystemInfo queryProjectSystemInfo(Long projectId); DmpProjectSystemInfo queryProjectSystemInfo(Long projectId);
/**条件查询项目信息 /**条件查询项目信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment