Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/base/db/dao.base.js

@@ -150,11 +150,11 @@ class Dao {
     var aggsinfos = [];
     var aggsinfos = [];
     if (qobj.aggsinfo) {
     if (qobj.aggsinfo) {
       qobj.aggsinfo.sum.forEach(aggitem => {
       qobj.aggsinfo.sum.forEach(aggitem => {
-        var t1 = [this.db.fn('SUM', this.db.col(aggitem.field)), aggitem.field + "_" + "sum"];
+        var t1 = [this.db.fn('SUM', this.db.col(aggitem.field)), aggitem.field + "~" + "sum"];
         aggsinfos.push(t1);
         aggsinfos.push(t1);
       });
       });
       qobj.aggsinfo.avg.forEach(aggitem => {
       qobj.aggsinfo.avg.forEach(aggitem => {
-        var t2 = [this.db.fn('AVG', this.db.col(aggitem.field)), aggitem.field + "_" + "avg"];
+        var t2 = [this.db.fn('AVG', this.db.col(aggitem.field)), aggitem.field + "~" + "avg"];
         aggsinfos.push(t2);
         aggsinfos.push(t2);
       });
       });
     }
     }