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

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -239,7 +239,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
         columns = me.reportColumns;
 
         Ext.Array.each(columns, function(c) {
-            Ext.applyIf(c, {
+            c.columns || Ext.applyIf(c, {
                 width: 120
             });