Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java

@@ -1,5 +1,8 @@
package com.matrix.system.hive.bean;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -26,6 +29,7 @@

    private String createBy;

    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT-8")
    private Date createTime;

    private String updateBy;