Merge branch 'dev/2.4_rai_new' into debug

controller/contract/register.go

@@ -258,10 +258,10 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		for _, v := range sellers {
 			if v.DepartmentId == crm.SellerDepartmentId {
 				sellerId = v.AdminId
-				sellerName = v.AdminName
+				sellerName = v.RealName
 			} else if v.DepartmentId == crm.RaiSellerDepartmentId {
 				raiSellerId = v.AdminId
-				raiSellerName = v.AdminName
+				raiSellerName = v.RealName
 			}
 		}
 	}
@@ -544,10 +544,10 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 		for _, v := range sellers {
 			if v.DepartmentId == crm.SellerDepartmentId {
 				sellerId = v.AdminId
-				sellerName = v.AdminName
+				sellerName = v.RealName
 			} else if v.DepartmentId == crm.RaiSellerDepartmentId {
 				raiSellerId = v.AdminId
-				raiSellerName = v.AdminName
+				raiSellerName = v.RealName
 			}
 		}
 	}