Commit Graph
1182 Commits
Author SHA1 Message Date
tianshujie98 28a8bf6082 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 11:25:00 +08:00
tianshujie98 6b69424799 * Finish task #36750. 2021-03-18 11:21:56 +08:00
zhujinyong b6a27819f3 * Fix menu. 2021-03-18 08:55:22 +08:00
tianshujie98 7d5dd33879 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 14:01:57 +08:00
tianshujie98 82c6e01251 * Finish task #36765. 2021-03-17 14:01:40 +08:00
zhujinyong 9268d6eba3 * Fix menu when creating project. 2021-03-17 12:13:12 +08:00
tianshujie98 a81650c22d * Fix bug. 2021-03-17 11:33:04 +08:00
tianshujie98 013f00cd14 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:24:37 +08:00
tianshujie98 da81be9508 * Adjust product ranking. 2021-03-17 10:23:04 +08:00
zhujinyong a9015ba45d * Adjust main menu. 2021-03-17 09:35:51 +08:00
zhujinyong 11aacd45d7 - Remove 'from' param. 2021-03-15 12:35:33 +08:00
holan20180123 53d6357305 * Fix create project error. 2021-03-15 10:16:32 +08:00
Yagami 0b0cdcbda7 * Rename personnel. 2021-03-12 10:57:09 +08:00
tianshujie98 0afece207e * Fix project batch editing problem. 2021-03-12 09:02:41 +08:00
tianshujie98 c46a398cd7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-11 14:57:10 +08:00
tianshujie98 c3eaf28e91 * Finish task #36486. 2021-03-11 14:55:05 +08:00
holan20180123 ae00791f4e * Finish task #11267. 2021-03-11 14:22:04 +08:00
Yagami b8ee8cffe5 * Sort projects. 2021-03-11 13:27:02 +08:00
Yagami 18ea33f62e * Finish task #36488. 2021-03-11 09:11:17 +08:00
holan20180123 eb6ddcaff0 * Finish task #36451. 2021-03-10 10:36:42 +08:00
holan20180123 a98432e958 * Finish task #36496. 2021-03-10 09:29:05 +08:00
holan20180123 700c0481d7 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-10 09:14:13 +08:00
holan20180123 8f294074bb * Finish task #36496. 2021-03-10 09:12:07 +08:00
Yagami 074bce86fd * Finish task #36459. 2021-03-09 16:55:09 +08:00
tianshujie98 c02b5e3b4a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-09 15:50:00 +08:00
tianshujie98 4ef5e5c188 * Finish task #36460. 2021-03-09 15:49:43 +08:00
Yagami d1e6e9265b * Rename project session to PRJ. 2021-03-09 15:29:06 +08:00
Yagami 84622c3231 * Fix project details. 2021-03-09 14:07:45 +08:00
Yagami 9098e727a5 * Fix project code details. 2021-03-09 13:44:42 +08:00
Yagami f818396a25 * Fix bug. 2021-03-09 10:39:52 +08:00
zhujinyong ad93900d35 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-08 20:31:34 +08:00
zhujinyong 0a39249189 * Format style. 2021-03-08 20:31:14 +08:00
holan20180123 f2f1f0c69d Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-08 17:00:05 +08:00
holan20180123 158f6e482d * Modify method name getProductsByProject to getProducts. 2021-03-08 16:59:30 +08:00
zhujinyong c10961bede * Fix index method of project. 2021-03-08 16:55:05 +08:00
holan20180123 4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
zhujinyong c435ec34cd * Move methods from execution to project. 2021-03-08 10:52:43 +08:00
zhujinyong 4e1ac813a4 * Adjust project/program module. 2021-03-08 10:10:18 +08:00
zhujinyong 426e118db1 * Ajdust project/program module. 2021-03-05 16:09:31 +08:00
Yagami 1ad514e0b0 * Divide program/project/execution. 2021-03-04 09:59:05 +08:00
wangyidong 8188a3fb15 * remove PRJ in method name for project module. 2021-03-04 09:06:52 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
zhujinyong 76baa276fd * Adjust program and project module. 2021-03-03 14:52:12 +08:00
Yagami 294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
hufangzhou 70cf865cd1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-02 09:18:15 +08:00
hufangzhou 68b2160651 * Adjust the code. 2021-03-02 09:18:12 +08:00
tianshujie98 948f9812f1 * Add comment. 2021-03-02 09:15:17 +08:00
tianshujie98 27908a30db Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-02 09:06:32 +08:00
tianshujie98 8eee062311 * Finish task #36339. 2021-03-02 09:05:36 +08:00
Yagami 4b7a9427a2 * Reviewing code fix details. 2021-03-02 09:04:34 +08:00