Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/view/change/information.ejs

@@ -433,7 +433,7 @@
         type: '<%- change.type %>',
         class: '<%- change.class %>',
         quality: '<%- change.quality %>',
-        company: '<%- change.company %>',
+        company: '<%- (change.company ? change.company : (companyList && companyList[0] ? companyList[0].name : '')) %>',
         charge: '<%- change.charge %>',
         w_code: '<%- change.w_code %>',
     };