Commit Graph
17195 Commits
Author SHA1 Message Date
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
qiyu-xie 45301c4aa5 * Finish task#8603. 2020-12-09 14:59:28 +08:00
wangyidong 97392669ff * finish task #8600. 2020-12-09 14:29:23 +08:00
tianshujie98 dd2381a1f6 * Fix product linked bugs. 2020-12-09 14:13:06 +08:00
holan20180123 65ba8b4e76 * Finish task #8675. 2020-12-09 14:07:49 +08:00
tianshujie98 7ffbc286fa * Finish task #8581. 2020-12-09 13:53:29 +08:00
holan20180123 8620b8471c Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-09 13:49:17 +08:00
holan20180123 95521e44a4 * Finish task #8613. 2020-12-09 13:48:51 +08:00
hufangzhou c64ea8fde8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-09 13:44:15 +08:00
hufangzhou 48b25d6970 * Finish task#8571, task#8572, task#8582, task#8583, task#8594. 2020-12-09 13:44:04 +08:00
Yagami f753d03fc5 * Finish task #8588. 2020-12-09 13:22:07 +08:00
Yagami 6cd56309e2 * Finish task #8585. 2020-12-09 13:19:07 +08:00
qiyu-xie f11c8319f7 * Finish task#8576. 2020-12-09 13:04:49 +08:00
qiyu-xie 2fa5e703b8 * Finish task#8591. 2020-12-09 13:04:49 +08:00
Yagami fdd19cd2a1 * Finish task #8580. 2020-12-09 11:41:41 +08:00
leiyong 56e0fc621f * Fix bug. 2020-12-09 11:28:54 +08:00
leiyong e11004f2c5 * Fix bug. 2020-12-09 11:14:42 +08:00
leiyong e571c8a1da * Fix bug. 2020-12-09 10:40:11 +08:00
holan20180123 9ee27cb146 * Finish task #8608. 2020-12-09 10:20:43 +08:00
holan20180123 68fe0c6a78 * Finish task #8575. 2020-12-09 10:12:12 +08:00
qiyu-xie 05f287a2e1 * Finish task#8587. 2020-12-09 10:03:46 +08:00
leiyong f2a8cfd828 * Adjust code. 2020-12-09 09:59:05 +08:00
tianshujie98 efdf9de3a9 * Finish task #8601. 2020-12-09 09:49:12 +08:00
leiyong 1d212e3eab Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-09 09:42:29 +08:00
leiyong 53df6f14e0 * Fix bug. 2020-12-09 09:42:15 +08:00
tianshujie98 f76973d4d2 * Finish task #8616. 2020-12-09 09:37:12 +08:00
leiyong 467c593f20 * Fix bug. 2020-12-09 09:34:20 +08:00
leiyong ed422d025c Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-09 09:30:15 +08:00
leiyong 32b2f62ba7 * Adjust code. 2020-12-09 09:29:59 +08:00
holan20180123 a5db689adf * Finish task #8609. 2020-12-09 09:27:03 +08:00
tianshujie98 89e0568619 * Finish task #8620. 2020-12-09 09:21:53 +08:00
qiyu-xie d7ede03687 * Finish task#8573. 2020-12-09 09:05:16 +08:00
leiyong bb485680aa * Adjust the budget module code. 2020-12-09 08:27:19 +08:00
Yagami 5c77489f08 * Fix product block. 2020-12-08 17:31:15 +08:00
qiyu-xie 4cc2c70e66 * Fix bug. 2020-12-08 14:48:17 +08:00
qiyu-xie f4d1880c5b * Delete the execution linked products that is not linked with the project. 2020-12-08 14:47:10 +08:00
tianshujie98 f4fb2b919a * Fix the bug search problem linked with the plan. 2020-12-08 14:42:44 +08:00
holan20180123 8579187993 * Fix bug #3644. 2020-12-08 14:32:25 +08:00
hufangzhou 8b291bc6da * Fix bug#3736. 2020-12-08 11:34:35 +08:00
leiyong d2ddce5e7c * Adjust the holiday module. 2020-12-08 11:08:32 +08:00
holan20180123 653f817e83 * Fix bug #3642. 2020-12-08 10:28:35 +08:00
tianshujie98 bfce366ef1 * Fix bug. 2020-12-08 08:24:20 +08:00
leiyong 83ed1f2423 * Adjust code. 2020-12-07 17:55:45 +08:00
leiyong 834aa60d87 Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-07 17:51:21 +08:00
Catouse 75b0867e1d * fix padding of todo view in modal. 2020-12-07 16:42:38 +08:00
qiyu-xie e4b26a2a13 * Fix bug. 2020-12-07 15:40:59 +08:00
tianshujie98 5be348e08e * Fix bug #3730. 2020-12-07 15:34:59 +08:00
leiyong 917e316962 * Fix bug. 2020-12-07 15:21:38 +08:00
Yagami 2914b834b2 * Merge code. 2020-12-07 15:07:57 +08:00