From a46339e796fc2ee56959618cf1a7ce0382c1c74c Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期六, 09 十月 2021 14:44:16 +0800
Subject: [PATCH] Merge branch 'Develop' into Dev_yzh
---
web/web/logs/logx.txt | 11 +++++++++++
web/web/logs/err.txt | 11 +++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/web/web/logs/err.txt b/web/web/logs/err.txt
index 1470285..fe50dbd 100644
--- a/web/web/logs/err.txt
+++ b/web/web/logs/err.txt
@@ -673,6 +673,11 @@
会话 ID: 14 序列号: 14066
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< Develop
+=======
+>>>>>>> Develop
=======
<<<<<<< Develop
=======
@@ -686,7 +691,10 @@
#79 2021-09-30 19:10:34,730 Common.dll OracleHelper.Execute SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
<<<<<<< HEAD
+<<<<<<< HEAD
=======
+=======
+>>>>>>> Develop
#54 2021-10-08 14:21:58,134 Common.dll OracleHelper.ExecuteReader ORA-03113: 通信通道的文件结尾
进程 ID: 7520
会话 ID: 69 序列号: 12596
@@ -697,4 +705,7 @@
在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
>>>>>>> local
+<<<<<<< HEAD
+>>>>>>> Develop
+=======
>>>>>>> Develop
diff --git a/web/web/logs/logx.txt b/web/web/logs/logx.txt
index 1470285..fe50dbd 100644
--- a/web/web/logs/logx.txt
+++ b/web/web/logs/logx.txt
@@ -673,6 +673,11 @@
会话 ID: 14 序列号: 14066
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< Develop
+=======
+>>>>>>> Develop
=======
<<<<<<< Develop
=======
@@ -686,7 +691,10 @@
#79 2021-09-30 19:10:34,730 Common.dll OracleHelper.Execute SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
<<<<<<< HEAD
+<<<<<<< HEAD
=======
+=======
+>>>>>>> Develop
#54 2021-10-08 14:21:58,134 Common.dll OracleHelper.ExecuteReader ORA-03113: 通信通道的文件结尾
进程 ID: 7520
会话 ID: 69 序列号: 12596
@@ -697,4 +705,7 @@
在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
>>>>>>> local
+<<<<<<< HEAD
+>>>>>>> Develop
+=======
>>>>>>> Develop
--
Gitblit v1.9.1