Merge remote-tracking branch 'origin/master'

2025-06-11 16:01:51 +08:00
parent 118775953b ed243f4e9d
commit 427df4a3bf
10 changed files with 32 additions and 30 deletions
--- a/api/merchantAdmin/v1/merchantAdmin.go
+++ b/api/merchantAdmin/v1/merchantAdmin.go
@ -10,5 +10,5 @@ type MerchantAdminInfoReq struct {
 type MerchantAdminInfoRes struct {
 	MerchantId int64  `json:"merchantId"`
 	Username   string `json:"username"`
-	StoreId    int64  `json:"storeId"` // 下属门店 id
+	Role       string `json:"role"`
 }