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

app/public/report/js/rpt_custom.js

@@ -632,7 +632,7 @@ const rptCustomObj = (function () {
                 return;
             }
         }
-        if (data[sGatherSelect].tenders.length > 20) {
+        if (data[sGatherSelect].tenders.length > (gsObj.setting.toplimit || 20)) {
             hintObj.html('您选择的标段过多，请移除部分').show();
             return;
         }