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

# Conflicts:
#	app/controller/report_controller.js

app/controller/report_controller.js

@@ -1388,8 +1388,8 @@ module.exports = app => {
                     otherHintName: '',
                     bizId: bglObj.BUSINESS_ID,
                     permissions: '[]',
-                    is_setting: true,
                     types_from: '',
+                    is_setting: false,
                 };
                 await this.layout('report/index.ejs', renderData, 'report/rpt_all_popup.ejs');
             } catch (err) {