diff --git a/dsBaseRpc/Config/ExcelStyle/tableStyleNormal.json b/dsBaseRpc/Config/ExcelStyle/tableStyleNormal.json index d4f15408..9d1c3036 100644 --- a/dsBaseRpc/Config/ExcelStyle/tableStyleNormal.json +++ b/dsBaseRpc/Config/ExcelStyle/tableStyleNormal.json @@ -8,6 +8,7 @@ "horizontal": "center", "vertical": "center" }, + "number_format": 49, "border": [ { "type": "left", diff --git a/dsBaseRpc/Utils/DateUtil/DateUtil.go b/dsBaseRpc/Utils/DateUtil/DateUtil.go index 23e23896..cc273390 100644 --- a/dsBaseRpc/Utils/DateUtil/DateUtil.go +++ b/dsBaseRpc/Utils/DateUtil/DateUtil.go @@ -29,7 +29,7 @@ func ConvertDate(ts string) time.Time { //如果是整数并且是5位的 _, err := strconv.Atoi(ts) if err == nil { //如果可以转为整数,那么可能是距离1900-01-01的天数 - return ConvertDateTime(ConvertToFormatDay(ts)) + return ConvertDateTime(ConvertToFormatDay(ts)+ " 00:00:00") } //如果是带时分秒的