Merge origin/main into dev to resolve conflicts

Co-authored-by: rocboss <11001145+rocboss@users.noreply.github.com>
pull/715/head
copilot-swe-agent[bot] 5 months ago committed by GitHub
commit ceb9258b83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -3,8 +3,8 @@ PaoPao部署站点信息。
| 名称 | 网址 | 站长 | 备注 |
| ----- | ----- | ----- | ----- |
|泡泡|[www.paopao.info](https://www.paopao.info)|[ROC](https://www.paopao.info/#/u?s=roc 'roc(@paopao.info)')|PaoPao官方站点|
|布里塔|[bulita.cn](https://bulita.cn)|[chendong](https://www.paopao.info/#/u?s=chendong 'chendong(@paopao.info)')|招聘求职等信息|
|提示词社区|[promptser.cn](https://promptser.cn)|[henryspace](https://www.paopao.info/#/u?s=henryspace 'henryspace(@paopao.info)')|提示词社区|
|iiBiuBiu|[iibiubiu.com](https://iibiubiu.com)|[北野](https://www.paopao.info/#/u?s=alimy 'alimy(@paopao.info)')|开发、测试备用机可以体验最新版本paopao-ce|
|稍言|[slowsay.com](https://slowsay.com)|[orzi](https://www.paopao.info/#/u?s=orzi 'orzi(@paopao.info)')|测试演示,修改了用户系统等内容|
|泡泡|[www.paopao.info](https://www.paopao.info)|[ROC](https://www.paopao.info/#/user?username=roc 'roc(@paopao.info)')|PaoPao官方站点|
|布里塔|[bulita.cn](https://bulita.cn)|[chendong](https://www.paopao.info/#/user?username=chendong 'chendong(@paopao.info)')|招聘求职等信息|
|提示词社区|[promptser.cn](https://promptser.cn)|[henryspace](https://paopao.info/#/user?username=henryspace 'henryspace(@paopao.info)')|提示词社区|
|iiBiuBiu|[iibiubiu.com](https://iibiubiu.com)|[北野](https://www.paopao.info/#/user?username=alimy 'alimy(@paopao.info)')|开发、测试备用机可以体验最新版本paopao-ce|
|稍言|[slowsay.com](https://slowsay.com)|[orzi](https://www.paopao.info/#/user?username=orzi 'orzi(@paopao.info)')|测试演示,修改了用户系统等内容|

Loading…
Cancel
Save