add order

ascle.yaml

@@ -153,3 +153,52 @@ paths:
                 image: 'http://hera.s.gmei.com/bulletin/2016/03/23/b3e00f8825'
                 title: 我的第一个公告
                 content_id: 2
+<<<<<<< ba9c38e85e9610870fde47c97414c9607f016596
+=======
+              message: ''
+              error: 0
+              success: true
+              error_code: 0
+  /order
+    get:
+      summary: 订单列表
+      description： 订单列表
+      parameters:
+        - name: statement_id
+          in: query
+          description: 对帐单ID
+          required: false
+          type: integer
+          format: integer
+        - name: status
+          in: query
+          description: 状态
+          required: false
+          type: string
+          format: string
+        - name: order_id
+          in: query
+          description: 订单ID
+          required: false
+          type: integer
+          format: integer
+        - name: order_by
+          in: query
+          description: 排序字段
+          required: false
+          type: integer
+          format: integer
+      tags:
+        - order
+      responses:
+        '200':
+          description: OK
+          examples:
+            application/json:
+              data:
+                total: 10
+              message: ''
+              error: 0
+              success: true
+              error_code: 0
+>>>>>>> add order