|
@@ -0,0 +1,58 @@
|
|
|
|
+[33mcommit a0ce62b47d318b403aaad125e4024dace65231b5[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mdev-jcq[m[33m, [m[1;31morigin/dev-zhn[m[33m, [m[1;31morigin/dev-ly[m[33m)[m
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Tue Sep 9 15:08:34 2025 +0800
|
|
|
|
+
|
|
|
|
+ style: 暂时隐藏多余ui + 弹窗样式
|
|
|
|
+
|
|
|
|
+[33mcommit a890fae1fed5c9fb4056ce9e0e5f1b2266f3a65f[m
|
|
|
|
+Merge: 99668ff a5741fe
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Tue Sep 9 14:16:21 2025 +0800
|
|
|
|
+
|
|
|
|
+ Merge branch 'dev-ly' into dev-zhn
|
|
|
|
+
|
|
|
|
+[33mcommit 99668ff3eb7a06bdee7f845fa5d8590116522a86[m
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Tue Sep 9 11:54:20 2025 +0800
|
|
|
|
+
|
|
|
|
+ style: 添加网站页面部分组件样式修改
|
|
|
|
+
|
|
|
|
+[33mcommit a5741fea59c506fc5e933245ac0e55da47a8651a[m[33m ([m[1;31morigin/dev-jcq[m[33m, [m[1;31morigin/dev-cmy[m[33m, [m[1;32mdev-ly[m[33m)[m
|
|
|
|
+Merge: 821d0cd 6a6974e
|
|
|
|
+Author: cmy <[email protected]>
|
|
|
|
+Date: Tue Sep 9 10:17:43 2025 +0800
|
|
|
|
+
|
|
|
|
+ Merge branch 'dev-ly' into dev-cmy
|
|
|
|
+
|
|
|
|
+ # Conflicts:
|
|
|
|
+ # src/components/server/ServerNameBox.vue
|
|
|
|
+
|
|
|
|
+[33mcommit 821d0cdd7e14a985183d1468d7b4922e15dca1f7[m
|
|
|
|
+Author: cmy <[email protected]>
|
|
|
|
+Date: Tue Sep 9 10:15:30 2025 +0800
|
|
|
|
+
|
|
|
|
+ 暂存
|
|
|
|
+
|
|
|
|
+[33mcommit 6a6974e0984d550714fe862dc836f6a108815f88[m
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Mon Sep 8 17:10:17 2025 +0800
|
|
|
|
+
|
|
|
|
+ chore: 使用mock模拟demo数据以进入系统进行开发
|
|
|
|
+
|
|
|
|
+[33mcommit dd53e28351e32298422d6d0c97d73155d778cfe5[m
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Mon Sep 8 16:27:58 2025 +0800
|
|
|
|
+
|
|
|
|
+ style: 添加网站页面部分样式修改
|
|
|
|
+
|
|
|
|
+[33mcommit b9a86bcd4c7c55e615ee03f1a7947805fe6805f5[m
|
|
|
|
+Author: zhaonan <[email protected]>
|
|
|
|
+Date: Thu Sep 4 17:35:27 2025 +0800
|
|
|
|
+
|
|
|
|
+ style: 添加网站,DNS设置,套餐设置页面部分样式修改
|
|
|
|
+
|
|
|
|
+[33mcommit a6a8c5ba84fa97e6281d05e469b24f93071444d0[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmaster[m[33m)[m
|
|
|
|
+Author: luoy <[email protected]>
|
|
|
|
+Date: Thu Sep 4 09:16:33 2025 +0800
|
|
|
|
+
|
|
|
|
+ first commit
|