From d5d0dead36ae8c53817ecbce7b1295c63f84f7c8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 01 四月 2025 10:00:34 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Expense/TestExpenseBase.cpp | 0
jrj/project/business/Expense/maint.samplerequest2.cpp | 0
jrj/project/tradedocument/DocSelectDlg.cpp | 2 +-
jrj/project/business/Expense/maint.samplesequest.cpp | 0
jrj/project/business/Expense/TestExpenseBase2.cpp | 0
5 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/jrj/project/business/Expense/TestExpenseBase.cpp b/jrj/project/business/Expense/TestExpenseBase.cpp
index 0bff000..6084046 100644
--- a/jrj/project/business/Expense/TestExpenseBase.cpp
+++ b/jrj/project/business/Expense/TestExpenseBase.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/TestExpenseBase2.cpp b/jrj/project/business/Expense/TestExpenseBase2.cpp
index 9e14639..39bd252 100644
--- a/jrj/project/business/Expense/TestExpenseBase2.cpp
+++ b/jrj/project/business/Expense/TestExpenseBase2.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplerequest2.cpp b/jrj/project/business/Expense/maint.samplerequest2.cpp
index 072f8bf..eea76ea 100644
--- a/jrj/project/business/Expense/maint.samplerequest2.cpp
+++ b/jrj/project/business/Expense/maint.samplerequest2.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplesequest.cpp b/jrj/project/business/Expense/maint.samplesequest.cpp
index 5a70678..bdf10a9 100644
--- a/jrj/project/business/Expense/maint.samplesequest.cpp
+++ b/jrj/project/business/Expense/maint.samplesequest.cpp
Binary files differ
diff --git a/jrj/project/tradedocument/DocSelectDlg.cpp b/jrj/project/tradedocument/DocSelectDlg.cpp
index ddb159c..08533d3 100644
--- a/jrj/project/tradedocument/DocSelectDlg.cpp
+++ b/jrj/project/tradedocument/DocSelectDlg.cpp
@@ -27,7 +27,7 @@
//焦点激活处理函数
int OnSetFocus(TEvent* evt, LPARAM param)
{
- //重置工具条
+ //重置工具条
return 1;
}
--
Gitblit v1.9.3