Commit Graph

908 Commits

Author SHA1 Message Date
Yagami
ac77fa3a15 * Merge code. 2021-01-27 15:20:27 +08:00
qiyu-xie
64e01f669f * Finish task#9094. 2021-01-27 13:47:12 +08:00
hufangzhou
f04fe0dbd6 * Fix bug#3816. 2021-01-27 13:26:00 +08:00
qiyu-xie
e9d2711275 * Finish task#9094. 2021-01-27 11:23:48 +08:00
tianshujie98
2502a01849 * Finish task #9106. 2021-01-25 13:07:23 +08:00
tianshujie98
74e01d785a * Finish task #9080. 2021-01-25 08:31:00 +08:00
tianshujie98
9ad0de0e4f * Finish task #9062. 2021-01-22 13:28:21 +08:00
tianshujie98
a0490d8e7e * Adjust code style. 2021-01-22 08:27:53 +08:00
Yagami
9988cbf6b8 * Fix details. 2021-01-21 13:40:46 +08:00
tianshujie98
420e374bf5 * Finish task #9021. 2021-01-21 10:07:40 +08:00
Yagami
d03194717d * Remove hourunit. 2021-01-20 15:48:58 +08:00
Yagami
36067c51cc * Code for project menu link. 2021-01-20 15:40:42 +08:00
Yagami
33e2fd4f46 * Fix details. 2021-01-19 16:19:56 +08:00
Yagami
b3058a8ad6 * Fix details. 2021-01-19 11:42:07 +08:00
Yagami
dafb68b70c * Code for hour unit. 2021-01-18 10:49:39 +08:00
tianshujie98
e647640432 * Change color. 2021-01-15 15:33:49 +08:00
tianshujie98
01e1008f29 * Finish task #9001. 2021-01-15 09:45:19 +08:00
Yagami
c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
holan20180123
652aa74347 * Finish task #9030. 2021-01-13 08:28:59 +08:00
Yagami
95a8b485d8 * Fix details. 2021-01-08 15:16:02 +08:00
Yagami
8e2ba0762e * Fix bug. 2020-12-24 09:49:27 +08:00
Yagami
830a63c705 * Add lang file. 2020-12-18 11:08:50 +08:00
Yagami
66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
leiyong
8e6d6bad63 * Adjust executionCommon to execution->common. 2020-12-18 10:03:32 +08:00
leiyong
ea3300acf4 * Replace ->planCommon. 2020-12-17 17:20:12 +08:00
Yagami
7c3a4053aa * Recode story concept. 2020-12-17 10:29:33 +08:00
hufangzhou
30e13a49c8 * Finish task#8687. 2020-12-16 14:22:32 +08:00
qiyu-xie
8a1e26837d * Delete link. 2020-12-15 09:34:58 +08:00
qiyu-xie
f25e318ed0 * Modify link. 2020-12-14 15:17:00 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
holan20180123
7af282b5f8 * Fix bug #3753. 2020-12-11 13:09:13 +08:00
leiyong
38867fc96c * Fix bug#3749. 2020-12-11 13:02:43 +08:00
holan20180123
791f1201dd * Fix bug #3756. 2020-12-11 11:42:55 +08:00
hufangzhou
0c0ed3ca18 * Fix an error. 2020-12-10 17:37:15 +08:00
hufangzhou
cd9b90a541 * Fix bug#3752. 2020-12-10 17:11:41 +08:00
hufangzhou
01774f22a3 * Fix bug#3739. 2020-12-10 13:17:48 +08:00
hufangzhou
752cdd463c Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-09 15:03:33 +08:00
hufangzhou
e279006f68 * Finish task#8612. 2020-12-09 15:03:04 +08:00
holan20180123
65ba8b4e76 * Finish task #8675. 2020-12-09 14:07:49 +08:00
qiyu-xie
f11c8319f7 * Finish task#8576. 2020-12-09 13:04:49 +08:00
holan20180123
68fe0c6a78 * Finish task #8575. 2020-12-09 10:12:12 +08:00
leiyong
53df6f14e0 * Fix bug. 2020-12-09 09:42:15 +08:00
leiyong
467c593f20 * Fix bug. 2020-12-09 09:34:20 +08:00
Yagami
5c77489f08 * Fix product block. 2020-12-08 17:31:15 +08:00
wangyidong
b5ad4665b4 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 09:26:47 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
qiyu-xie
80a335e36f * Fix bug#3667. 2020-12-07 13:45:53 +08:00
qiyu-xie
b7fc85e621 * Fix bug#3667. 2020-12-07 10:33:13 +08:00
leiyong
d990666ee6 * Fix bug. 2020-12-07 09:50:03 +08:00
tianshujie98
5dbe3dd6d3 * Fix bug. 2020-12-07 08:50:36 +08:00