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);
       });
       });
     }
     }

ic-deliver/app/base/db/metadata/app/platform.js

@@ -140,7 +140,7 @@ module.exports = {
                 "no": "不需要"
                 "no": "不需要"
             },
             },
             "addressTypeDict": {//经营地址类型
             "addressTypeDict": {//经营地址类型
-                " practical ": "实际经营地址",
+                "practical": "实际经营地址",
                 "virtual": "虚拟地址"
                 "virtual": "虚拟地址"
             },
             },
             "registeredTypeDict": {//个体户类型
             "registeredTypeDict": {//个体户类型
@@ -157,7 +157,7 @@ module.exports = {
             },
             },
             "agentTypeDict": {//代理记账主体类型
             "agentTypeDict": {//代理记账主体类型
                 "company": "公司",
                 "company": "公司",
-                "individual ": "个体户" 
+                "individual": "个体户" 
             },
             },
             "dyDict":{//产品对应关系
             "dyDict":{//产品对应关系
                 "/ic/gsreg/":"companyCase",
                 "/ic/gsreg/":"companyCase",