Merge branch 'mlh_jzjx_project' into 'master'

创建时间先排序

See merge request !37

roke_product_income_expense/controller/main.py

@@ -151,7 +151,7 @@ class ProductIncomeExpenseIframe(http.Controller):
             SELECT id, business_date, abstract, customer, income, expenditure, balance, machinery_type, create_uid, create_date
             SELECT id, business_date, abstract, customer, income, expenditure, balance, machinery_type, create_uid, create_date
             FROM roke_product_income_expense
             FROM roke_product_income_expense
             WHERE {where_sql}
             WHERE {where_sql}
-            ORDER BY business_date DESC, create_date DESC
+            ORDER BY create_date DESC,business_date DESC
             LIMIT %s OFFSET %s
             LIMIT %s OFFSET %s
         """
         """
         params.extend([limit, offset])
         params.extend([limit, offset])