From c0a77acc892d89bf7dd4a04a19d85ba71c0dd57c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 26 八月 2024 16:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-rx-卡项促销活动分类' into master-jiayan-test

---
 pom.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index da1dd64..398307f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.hx.gitee</groupId>
         <artifactId>hx-parent</artifactId>
-        <version>stander</version>
+        <version>jiayan</version>
         <relativePath/>
     </parent>
 
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>com.hx.gitee</groupId>
                 <artifactId>hx-common</artifactId>
-                <version>stander</version>
+                <version>jiayan</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

--
Gitblit v1.8.0