Merge branch 'dev'

@@ -32,6 +32,7 @@ public class TradeBillsBo {
     private BigDecimal amount;
 
 
+    private Integer createTime;
 
 
 }

@@ -53,6 +53,9 @@ public class AssetsService {
         assetsResp.setSummary(summary);
         assetsResp.setData(detailList);
         assetsResp.setTotal(total);
+        assetsResp.setPage(page);
+        assetsResp.setPageSize(pageSize);
+        assetsResp.setPagetotal(total);
         return assetsResp;
     }
 
@@ -95,6 +98,7 @@ public class AssetsService {
             bo.setIncomeOutcome(bills.getIncomeOutcome());
             bo.setOrderCode(bills.getOrderCode());
             bo.setTradeType(bills.getTradeType());
+            bo.setCreateTime(bills.getCreateTime());
             bo.setTradeTypeDesc(TradeType.getTradeTypeByCode(bills.getTradeType()).getDesc());
             rtnList.add(bo);
         }