From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java
new file mode 100644
index 0000000..3e54fb9
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java
@@ -0,0 +1,22 @@
+package com.ruoyi.common.constant;
+
+/**
+ * @Description 对接微信小程序的常量
+ * @Author xiaochen
+ * @Date 2021/10/19/01914:01
+ */
+public class WxConstant {
+
+    /**
+     * 生成小程序码地址
+     */
+    public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN";
+
+    /**
+     * 高德地图坐标转换
+     */
+    public static final String ADDRESS_CONVERT_TO_COORDINATE = "https://restapi.amap.com/v3/geocode/geo?key=KEY&address=ADDRESS";
+
+
+
+}

--
Gitblit v1.7.1