From d30252673cbd95fb6eb429d3ccb10c3f7196b5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 18 Jan 2022 11:58:28 +0800 Subject: [PATCH] 123 --- business/jxutils/jxutils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 6adf77001..a5857a5c6 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -1017,7 +1017,7 @@ func PKCS5UnPadding(origData []byte) []byte { return origData[:(length - unpadding)] } -//合成水印图1 +//合成水印图12 func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) { if exPrefixBegin != nil && exPrefixEnd != nil { if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {