!8110 Merge remote-tracking branch 'origin/dev' into dev

Merge pull request !8110 from 李鹏宇/dev

yuthon_notice/controllers/main.py

@@ -11,7 +11,6 @@ class YuthonNotice(http.Controller):
     @http.route('/yuthon/yuthon/notice', methods=['POST'], type='http', auth='none', csrf=False)
     def index(self, **kwargs):
         id = kwargs.get('id')
-
         data = request.env['yuthon.notice'].sudo().search([("id", "=", int(id))])
         documents = []
         for document in data.documents_ids:
@@ -31,10 +30,18 @@ class YuthonNotice(http.Controller):
             'title': data.name,
             'code': data.code,
             'create_date1': fields.Date.to_string(data.create_date1),
-            'notice_text': data.notice_text,
+            'notice_text': data.notice_text1,
             'documents':documents,
             'user_name':data.users_id.name,
             'read_number': data.read_number,
+            'file_list': [{
+                'file_url': 'https://view.officeapps.live.com/op/view.aspx?src=https%3A//oa.thtzjt.com/web/content/office_preview/13672',
+                'file_name': 'excel',
+            },
+            {
+                'file_url': 'https://oa.thtzjt.com/web/content/preview/13673',
+                'file_name': 'pdf',
+            }]
         }
         return json.dumps({
             'data':result,