Merge branch 'MoneyNote3.0' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote into MoneyNote3.0

app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountModel.java

@@ -105,6 +105,7 @@ public class AccountModel implements AccountContract.AccountModel {
         categoryDBbean.setMonth(Integer.parseInt(split[1]));
         categoryDBbean.setDay(Integer.parseInt(split[2]));
         categoryDBbean.setUpdateTime(System.currentTimeMillis());
+        categoryDBbean.setCreateTime(System.currentTimeMillis());
         categoryDBbean.setDemo(billBody.getDemo());
         categoryDBbean.setName(name);
         categoryDBbean.setType_imagepath(BillCategoreDaoOperator.newInstance().getDetaillIconUrlById(Integer.parseInt(billBody.getCategory_id())));

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialDBOpertor.java

@@ -152,6 +152,7 @@ public class DetialDBOpertor {
             java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
             typeDataJson.setAccount( df.format(list.get(i).getAccount()) + "");
             typeDataJson.setName(list.get(i).getName());
+            typeDataJson.setDemo(list.get(i).getDemo());
             datas.add(typeDataJson);
         }
         return datas;