From 7a91c3a1ed37b0332d4ff0ebeae60bd6da3665c0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 16 七月 2024 18:28:58 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/BasicCode/ShipcompanyMaint.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
index 5d399ae..1d88656 100644
--- a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
+++ b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
@@ -46,13 +46,14 @@
 		SetAgent(L"maint");
 		return 1;
 	}
-	xstring GetGuid() {
-		return TApp::GetGuid();
+	xstring GetGuid() 
+	{
+		return publiccode::GetGuid();
 	}
 	int OnClear() {
 		if (m_EntityID == L"") {
-			m_userid = TApp::GetUserInfo().id;
-			m_username = TApp::GetUserInfo().name;
+			m_userid = publiccode::GetUser().id;
+			m_username = publiccode::GetUser().name;
 			dw_base = new xdwtable;
 			dw_base.setNativePointer(GetControl(L"dw_base"));
 			dw_base.SetItemString(1, L"PartyID", GetGuid());
@@ -66,7 +67,7 @@
 			dw_base.SetItemString(1, L"PrimaryFlag", L"Y");
 			dw_base.SetItemString(1, L"EnterName", m_userid);
 			dw_base.SetItemDisplayString(1, L"EnterName", m_username);
-			dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate());
+			dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
 		}
 		else
 		{

--
Gitblit v1.9.3