From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/pom.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/framework/pom.xml b/framework/pom.xml
index 3851799..f52589c 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -15,12 +15,17 @@
<packaging>jar</packaging>
<dependencies>
- <!-- 鑵捐cos瀵硅薄瀛樺偍鏈嶅姟 -->
- <dependency>
- <groupId>com.qcloud</groupId>
- <artifactId>cos_api</artifactId>
- <version>${tx-cos.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.bytedeco</groupId>-->
+<!-- <artifactId>javacv-platform</artifactId>-->
+<!-- <version>1.5.9</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.bytedeco</groupId>-->
+<!-- <artifactId>ffmpeg-platform</artifactId>-->
+<!-- <version>6.0-1.5.9</version>-->
+<!-- </dependency>-->
+ <!-- cos sts -->
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos-sts_api</artifactId>
--
Gitblit v1.8.0