From d1812cf38f994045bf1874cedf1f06b96714bca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=AE=87=E9=B9=8F?= <1933304128@qq.com>
Date: Fri, 17 Mar 2023 17:00:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9curd=E5=88=9B=E5=BB=BAmod?=
=?UTF-8?q?el=E6=96=87=E4=BB=B6=E6=97=B6=E6=8E=92=E5=BA=8F=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/command/Crud/stubs/mixins/modelinit.stub | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/application/admin/command/Crud/stubs/mixins/modelinit.stub b/application/admin/command/Crud/stubs/mixins/modelinit.stub
index 329fb95c5..7f1a99296 100644
--- a/application/admin/command/Crud/stubs/mixins/modelinit.stub
+++ b/application/admin/command/Crud/stubs/mixins/modelinit.stub
@@ -2,7 +2,9 @@
protected static function init()
{
self::afterInsert(function ($row) {
- $pk = $row->getPk();
- $row->getQuery()->where($pk, $row[$pk])->update(['{%order%}' => $row[$pk]]);
+ if (!isset($row['{%order%}'])){
+ $pk = $row->getPk();
+ $row->getQuery()->where($pk, $row[$pk])->update(['{%order%}' => $row[$pk]]);
+ }
});
}
--
Gitee
From d576fb4fe69c25b1d58d23181a21b32cc86cb34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 17:47:06 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 5ef2ba5e8..3c8607379 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -17,7 +17,9 @@
--
Gitee
From 9e54ff22c3039e22f58e79ac4a64385da04acb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 17:52:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 3c8607379..533c26794 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -18,7 +18,7 @@
- 测试git远程推送
+ 测试git远程推送001
{:__('Member center')}
--
Gitee
From 2e54d290935b3ba5bb2a178bc5ae2ae44e3d718e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 17:54:28 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 533c26794..746ee83dc 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -18,7 +18,7 @@
- 测试git远程推送001
+ 测试git远程推送0022
{:__('Member center')}
--
Gitee
From 0c17d0c9f693a8542e21af8197d01d361239ce6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 18:01:13 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 746ee83dc..2967c4aff 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -18,7 +18,7 @@
- 测试git远程推送0022
+ 测试git远程推送00222
{:__('Member center')}
--
Gitee
From f0a4c95ec7eabcbc5fd2c02ef24e22cd08c6bd69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 22:14:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 2967c4aff..020e77ba6 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -18,7 +18,7 @@
- 测试git远程推送00222
+ 测试git远程推送00222oooo
{:__('Member center')}
--
Gitee
From 40bf04957fc416c0b51043c0646099b95eb859c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E9=B9=8F=20=E9=83=AD?= <1933304128@qq.com>
Date: Tue, 2 Jan 2024 22:18:18 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/index/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 020e77ba6..ee8fc7a4d 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -18,7 +18,7 @@