generated from root/miduo_server
Merge branch 'master' of http://60.1.1.230/backend/gm_tw_admin
commit
f87efe8200
|
|
@ -34,7 +34,7 @@ public class FindFlowController {
|
|||
if (type ==1){
|
||||
List<MoneyFlow> moneyFlowList = itemDao.findMoneyFlowInfo(serverId,startTime,endTime,userId);
|
||||
map.put("moneyFlows",moneyFlowList);
|
||||
return " ";
|
||||
return "moneyFlows";
|
||||
}else{
|
||||
List<ItemFlow> itemFlowList = itemDao.findItemFlowInfo(serverId,startTime,endTime,userId);
|
||||
map.put("itemFlows",itemFlowList);
|
||||
|
|
|
|||
Loading…
Reference in New Issue