Merge branch 'main' of http://git.feec.cn/bes/BESCMS

2026-08-14 00:05:26 +08:00
parent 944e05fab5 7111c44925
commit 88bd5649cb
1 changed files with 6 additions and 0 deletions
@@ -7,9 +7,15 @@ return [
    'name' => '北斯云',
    'cms' => 'BESCMS',
    'url' => 'https://www.bescms.com',
+<<<<<<< HEAD
    'domain' => 'https://www.bescms.com',
    'cloud' => 'https://www.bescms.com',
    'service' => 'https://www.bescms.com',
+=======
+    'domain' => 'https://www.besyun.com',
+    'cloud' => 'https://www.besyun.com',
+    'service' => 'https://www.besyun.com',
+>>>>>>> 7111c44925e9430b4f34d62673a1a0b71f514ce6
    'license' => '375C71349B295FBE2DCDCA9206F20A1703',

 ];