Merge branch 'developer' into 'master'

小程序二维码修改

See merge request !41

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/BillListVO.java

@@ -3,6 +3,8 @@ package com.gic.enterprise.web.vo;
 import com.gic.commons.util.DateUtil;
 import com.gic.enterprise.constant.BuyTypeEnum;
 import com.gic.enterprise.constant.PayTypeEnum;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.Serializable;
 import java.text.ParseException;
@@ -18,6 +20,7 @@ import java.util.Date;
  */
 public class BillListVO implements Serializable{
     private static final long serialVersionUID = -3737832047382825129L;
+    private static Logger logger = LogManager.getLogger(BillListVO.class);
 
     /**
      * 支付流水号
@@ -102,7 +105,7 @@ public class BillListVO implements Serializable{
         try {
             return format.parse(timeEnd);
         } catch (ParseException e) {
-            e.printStackTrace();
+            logger.warn("e", e);
         }
         return null;
     }

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/PushMessageController.java

@@ -85,7 +85,7 @@ public class PushMessageController {
             response = this.pushMessageApiService.pagePushMessage(search, pushStatus,
                     StringUtils.isBlank(startTime) ? null : simpleDateFormat.parse(startTime+" 00:00:00"), StringUtils.isBlank(endTime) ? null : simpleDateFormat.parse(endTime+" 23:59:59"), pageQO.getCurrentPage(), pageQO.getPageSize(), classifyId);
         } catch (ParseException e) {
-            e.printStackTrace();
+            log.warn("e", e);
         }
         return RestResponse.success(response.getResult());
     }