zzy.zhiyuan.foxmail 8 gadi atpakaļ
vecāks
revīzija
c3908da022
1 mainītis faili ar 2 papildinājumiem un 5 dzēšanām
  1. 2 5
      src/main/java/com/ekexiu/portal/dao/DemandDao.java

+ 2 - 5
src/main/java/com/ekexiu/portal/dao/DemandDao.java

@ -47,14 +47,11 @@ public abstract class DemandDao {
47 47
	@Column(handlerClass=IntHandler.class,value="COUNT(1)")
48 48
	@From(Demand.class)
49 49
	public abstract int queryCountStatus(Connection con,String demandStatus)throws SQLException, JfwBaseException;
50
	
51
<<<<<<< HEAD
52
=======
50
	
53 51
	@SelectList
54 52
	@OrderBy("ORDER BY CREATE_TIME DESC")
55 53
	public abstract List<Demand> queryForOrg(Connection con,String orgId)throws SQLException;
56
	
57
>>>>>>> refs/remotes/origin/dev
54
	
58 55
	@SelectList
59 56
	@OrderBy("ORDER BY CREATE_TIME DESC")
60 57
	public abstract List<Demand> queryByDemander(Connection con,String demander)throws SQLException;