Merge remote-tracking branch 'origin/server-dev' into server-dev

# Conflicts:
#	server/README.MD
#	server/api/admin/admin.go
#	server/api/appstore/appstore.go
#	server/api/pano/pano.go
#	server/api/stackchandevice/stackchandevice.go
#	server/api/user/user.go
#	server/api/xiaozhi/xiaozhi.go
#	server/go.mod
#	server/go.sum
#	server/internal/cmd/cmd.go
#	server/internal/controller/admin/admin_v1_delete_app.go
#	server/internal/controller/dance/dance_v1_get_list.go
#	server/internal/controller/dance/dance_v2_get_list.go
#	server/internal/controller/device/device_v2_agent_restore_default.go
#	server/internal/controller/device/device_v2_bind_device.go
#	server/internal/service/user.go
#	server/utility/rsa.go
This commit is contained in:
yuanzhihong
2026-06-24 09:58:07 +08:00
5 changed files with 25 additions and 0 deletions
+5
View File
@@ -1,3 +1,8 @@
/*
SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
SPDX-License-Identifier: MIT
*/
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
+5
View File
@@ -1,3 +1,8 @@
/*
SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
SPDX-License-Identifier: MIT
*/
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
+5
View File
@@ -1,3 +1,8 @@
/*
SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
SPDX-License-Identifier: MIT
*/
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
+5
View File
@@ -1,3 +1,8 @@
/*
SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
SPDX-License-Identifier: MIT
*/
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
+5
View File
@@ -1,3 +1,8 @@
/*
SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
SPDX-License-Identifier: MIT
*/
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================