From f89766c67e39852650fe55cdfee371a204b2b01d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 18:04:45 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BondEq/View/UserManagerDlg.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/UserManagerDlg.cpp b/SourceCode/Bond/BondEq/View/UserManagerDlg.cpp
index 10dddbd..849c4a9 100644
--- a/SourceCode/Bond/BondEq/View/UserManagerDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/UserManagerDlg.cpp
@@ -119,7 +119,7 @@
 	int nCurrNameRow = -1;
 	std::vector<std::vector<std::string>> usersData = userManager.getUsers();
 	if (!usersData.empty()) {
-		m_gridUserManager.SetRowCount(usersData.size() + 1);
+		m_gridUserManager.SetRowCount((int)usersData.size() + 1);
 
 		for (int i = 0; i < usersData.size(); i++) {
 			int nRowIdx = i + 1;

--
Gitblit v1.9.3