From 685e6130b94cb1c8543b2b44e35fe50c27092b7a Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Thu, 27 Jun 2019 23:05:27 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=8A=A8=E6=80=81=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: vilson <545522390@qq.com>
---
application/common/Model/Task.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index d4b150a..bedeb71 100644
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -97,7 +97,7 @@ class Task extends CommonModel
}
$result = self::update($data, ['code' => $code]);
$member = getCurrentMember();
- $type = 'name';
+ $type = '';
if (isset($data['name'])) {
$type = 'name';
}
@@ -122,7 +122,7 @@ class Task extends CommonModel
$type = 'clearEndTime';
}
}
- self::taskHook($member['code'], $code, $type);
+ $type && self::taskHook($member['code'], $code, $type);
//TODO 任务动态
return $result;
}
From 4bcb6643b8ab3f12953feb8cb2ed31aef1d3e974 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Thu, 27 Jun 2019 23:05:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E8=87=B32.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: vilson <545522390@qq.com>
---
config/app.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/app.php b/config/app.php
index fdd072b..c780f3d 100644
--- a/config/app.php
+++ b/config/app.php
@@ -6,7 +6,7 @@ return [
// 应用名称
'app_name' => 'pearProject',
// 应用版本
- 'app_version' => '2.6.0',
+ 'app_version' => '2.6.1',
// 应用地址
'app_host' => '',
// 应用调试模式
From 8300b9b1ed75a23e76d79e90ad1110b338d2dcef Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 29 Jun 2019 11:25:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: vilson <545522390@qq.com>
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 6dbb816..d078bf6 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# pearProjectApi
+# PearProject
-基于Vue.js实现的项目管理系统
+**Pear，梨子项目管理系统**
-相关资料：https://www.yuque.com/vilson/ef1m6t
+**相关资料：https://www.yuque.com/vilson**
需要配合[前端项目](https://github.com/a54552239/pearProject)使用，链接：https://github.com/a54552239/pearProject
From 83ca27866a1060e6773ed4735c3d6230ece515fa Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 29 Jun 2019 17:46:43 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: vilson <545522390@qq.com>
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index d078bf6..8e0a26d 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
**相关资料：https://www.yuque.com/vilson**
+**社区站点：https://bbs.vilson.xyz**
+
需要配合[前端项目](https://github.com/a54552239/pearProject)使用，链接：https://github.com/a54552239/pearProject
有不明白的地方的可以加群：275264059，或者联系我，QQ：545522390
From 7868ae62a364a0a836af89534c01dc0db6ac3995 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Mon, 1 Jul 2019 07:55:20 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: vilson <545522390@qq.com>
---
README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 8e0a26d..06b833f 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,7 @@
**Pear，梨子项目管理系统**
-**相关资料：https://www.yuque.com/vilson**
-
-**社区站点：https://bbs.vilson.xyz**
+**相关资料：https://www.yuque.com/bzsxmz**
需要配合[前端项目](https://github.com/a54552239/pearProject)使用，链接：https://github.com/a54552239/pearProject