Commit Graph
611 Commits
Author SHA1 Message Date
hufangzhou 5d72faff48 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-18 13:26:01 +08:00
hufangzhou dd341daed7 * Fix the bug of the story filter. 2021-01-18 13:25:58 +08:00
tianshujie98 e989d459fa * Finish task #9049. 2021-01-18 13:17:54 +08:00
tianshujie98 418039eecf * Finish task #9049. 2021-01-18 11:34:01 +08:00
Yagami 92a559c37d * Fix story bug. 2021-01-18 10:20:39 +08:00
Yagami 2ce5ef1d5b * Fix story hour detail. 2021-01-18 10:13:46 +08:00
Yagami 8b90a207c0 * Finish task #9010. 2021-01-18 09:11:40 +08:00
Yagami ad1885be6a * Finish task #9020. 2021-01-18 09:04:56 +08:00
hufangzhou 2d14f0aec4 * Finish task#8956. 2021-01-15 16:41:41 +08:00
Yagami c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
tianshujie98 1b2ae5c4cc * Add digital judgment. 2021-01-14 10:39:15 +08:00
tianshujie98 cf613fdbac * Finish task #8882,8884. 2021-01-01 09:54:34 +08:00
Yagami f4db6376b2 * Finish task #8812. 2020-12-23 10:28:28 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
Yagami 10f1cee5b9 * Adjust code. 2020-12-17 16:13:34 +08:00
qiyu-xie ef388e7528 * Fix bug#3692. 2020-12-17 15:01:01 +08:00
tianshujie98 7c0132ae9b * Modify the variables of the story module. 2020-12-17 13:49:56 +08:00
holan20180123 95521e44a4 * Finish task #8613. 2020-12-09 13:48:51 +08:00
tianshujie98 53a74eccd3 * Fix bug #3666. 2020-12-01 15:51:22 +08:00
hufangzhou 1bcf0274af * Finish task#8561. 2020-11-30 17:26:33 +08:00
hufangzhou 9ce4ed5e75 * Fix an error. 2020-11-27 10:29:57 +08:00
leiyong 4f2775d77a * Adjust the projectstory module. 2020-11-26 13:10:08 +08:00
z 18ee52ff86 * finish task #8442. 2020-11-25 14:39:49 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
tianshujie98 48e4e31a30 * Finish task #8397. 2020-11-18 10:33:34 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
hufangzhou 298204a438 * Finish task#8412. 2020-11-17 14:26:13 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
leiyong b0a9a38e15 * Finish task#8310. 2020-11-16 15:37:08 +08:00
tianshujie98 c0e6591afe * Adjust code style. 2020-11-16 10:56:02 +08:00
tianshujie98 97e2891c4a * Fix bug. 2020-11-16 09:01:24 +08:00
holan20180123 cef356a33b Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-15 22:39:48 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
tianshujie98 7d18efad03 * Adjust code style. 2020-11-13 13:11:39 +08:00
holan20180123 fb9c44d0a1 * Finish task #8194. 2020-11-13 11:28:25 +08:00
tianshujie98 8a20821f92 * Adjust code style. 2020-11-13 08:09:21 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
holan20180123 5fabab2a63 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-12 10:13:05 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
z 154ace870a * finish task #8265. 2020-11-12 09:25:13 +08:00
holan20180123 07d0f7c6d8 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-06 14:01:58 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
qiyu-xie a8d9f1d796 * Finish task#8211. 2020-11-06 09:28:53 +08:00
tianshujie98 b400af6ffc * Finish task #8262. 2020-11-04 14:07:15 +08:00
Yagami 5e6861d852 * Fix bugs. 2020-11-03 13:33:30 +08:00
Yagami 18131e47ef * Fix bugs. 2020-11-02 10:09:40 +08:00
leiyong a80fb13c7b * Deleting duplicate sortStoriesOfPlan methods. 2020-11-02 09:07:14 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98 4c512289bb * Edit comment. 2020-10-13 14:23:03 +08:00
tianshujie98 5e30da5817 * Edit comment. 2020-10-13 14:18:37 +08:00