Merge branch 'bpo-stat' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-stat

bpo-stat/app/base/service/impl/all/merchantSve.js

@@ -39,7 +39,7 @@ class MerchantService extends ServiceBase {
         var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
         if (page && page.rows) {
             for (var row of page.rows) {
-                this.handleDate(row, ["begin_time", "invalid_time"]);
+                this.handleDate(row, ["begin_time", "invalid_time"], "YYYY-MM-DD");
             }
         }
         return page;