From 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 16:58:18 +0800
Subject: [PATCH] Merge branch 'master' into herb-new
---
LICENSE | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8eecf84..0848ca2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
identification within third-party archives.
Copyright (c) 2019 <a href="http://www.jeecg.com">Jeecg Boot</a> All rights reserved.
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -199,15 +199,14 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
寮�婧愬崗璁ˉ鍏�
JeecgBoot 鏄敱 鍖椾含鍥界偓淇℃伅鎶�鏈湁闄愬叕鍙� 鍙戣鐨勮蒋浠躲�� 鎬婚儴浣嶄簬鍖椾含锛屽湴鍧�锛氫腑鍥铰峰寳浜锋湞闃冲尯绉戣崯鍓嶈1鍙烽櫌濂ユ灄浣虫嘲澶у帵銆傞偖绠憋細jeecgos@163.com
鏈蒋浠跺彈閫傜敤鐨勫浗瀹惰蒋浠惰憲浣滄潈娉曪紙鍖呮嫭鍥介檯鏉＄害锛夊拰鍙岄噸淇濇姢璁稿彲銆�
-
+
1.鍏佽鍩轰簬鏈钩鍙拌蒋浠跺紑灞曚笟鍔＄郴缁熷紑鍙戙��
2.涓嶅緱鍩轰簬璇ュ钩鍙拌蒋浠剁殑鍩虹锛屼慨鏀瑰寘瑁呮垚涓�涓笌JeecgBoot骞冲彴杞欢鍔熻兘绫讳技鐨勪骇鍝佽繘琛屽彂甯冦�侀攢鍞紝鎴栦笌JeecgBoot鍙備笌鍚岀被杞欢浜у搧甯傚満鐨勭珵浜夈��
杩濆弽姝ゆ潯娆惧睘浜庝镜鏉冭涓猴紝椤昏禂鍋夸镜鏉冪粡娴庢崯澶憋紝鍚屾椂绔嬪嵆鍋滄钁椾綔鏉冧镜鏉冭涓恒��
瑙ｉ噴鏉冨綊锛歨ttp://www.jeecg.com
-
\ No newline at end of file
--
Gitblit v1.9.3