Commit Graph
385 Commits
Author SHA1 Message Date
hufangzhou 797f353864 * Finish task#8958, task#8960. 2021-01-12 14:50:21 +08:00
tianshujie98 a93608d807 * Finish task #8975. 2021-01-12 13:15:04 +08:00
qiyu-xie 5b1d770474 * Finish task#8978. 2021-01-12 10:35:15 +08:00
Yagami 098fc50cc0 * Fix program product and project details. 2021-01-07 13:35:27 +08:00
holan20180123 cb0053e003 * Finish task #8910. 2021-01-05 16:07:14 +08:00
sgm0422 9b08d19c22 * Fix details. 2021-01-03 15:05:36 +08:00
Yagami f2a39a0dbc * Add product program project menu group. 2021-01-01 16:03:51 +08:00
hufangzhou abd9b39619 * Finish task#8868, task#8873. 2021-01-01 15:16:34 +08:00
hufangzhou 3ac76d1d02 * Adjust the code. 2020-12-30 16:18:54 +08:00
hufangzhou 504ee5f6c3 * Adjust the code. 2020-12-30 16:03:55 +08:00
Yagami ef9fe6acee * Fix details. 2020-12-30 13:02:31 +08:00
hufangzhou 7496200925 * Finish task#8752. 2020-12-29 16:28:13 +08:00
hufangzhou 22b742d612 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2020-12-28 09:55:43 +08:00
hufangzhou 48e4241c47 * Adjust the code. 2020-12-28 09:55:39 +08:00
tianshujie98 33e2b79be2 * Add comment. 2020-12-25 17:18:29 +08:00
tianshujie98 1198197328 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2020-12-24 13:36:50 +08:00
tianshujie98 a263f32394 * Modify the sorting problem. 2020-12-24 13:36:02 +08:00
hufangzhou e9e74e0652 * Finish task#8737. 2020-12-24 13:30:14 +08:00
hufangzhou 3542359112 * Finish task#8750. 2020-12-24 11:16:30 +08:00
tianshujie98 5db867a5a0 * Finish task #8765. 2020-12-24 09:16:35 +08:00
tianshujie98 c9171ad5a3 * Finish task #8764. 2020-12-22 11:08:27 +08:00
Yagami ae552beafa * Merge sql. 2020-12-16 16:52:37 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
hufangzhou 0aa9987f0c * Fix bug#3755. 2020-12-11 10:06:26 +08:00
holan20180123 95521e44a4 * Finish task #8613. 2020-12-09 13:48:51 +08:00
leiyong e11004f2c5 * Fix bug. 2020-12-09 11:14:42 +08:00
wangyidong 8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
Yagami 2914b834b2 * Merge code. 2020-12-07 15:07:57 +08:00
leiyong d61e913cbf * Fix bug. 2020-12-07 13:36:04 +08:00
qiyu-xie 81807b4491 * Modify select product of second navigation under product. 2020-12-04 16:11:05 +08:00
leiyong 58f8f4b234 * Adjust code. 2020-12-04 13:48:23 +08:00
leiyong 34ae30150b * Fix bug#3521. 2020-12-02 10:44:35 +08:00
leiyong 53e0784d6a * Finish task#8546 2020-12-01 11:17:57 +08:00
leiyong 7b8e7b4c65 * Adjust product module. 2020-11-30 13:04:37 +08:00
Yagami 1f5c6ddb6b * Finish task #8453. 2020-11-27 11:22:36 +08:00
leiyong 36ab9238fd * Fix bug 2020-11-27 11:18:08 +08:00
leiyong 49a33127e2 * Adjust the projectstory module. 2020-11-26 13:57:36 +08:00
leiyong 4f2775d77a * Adjust the projectstory module. 2020-11-26 13:10:08 +08:00
Yagami 17e525245b * Fix program get list logic and fix details. 2020-11-26 10:05:39 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
leiyong ac5d658933 * Adjust getExecutionPairsByProduct method. 2020-11-24 15:58:26 +08:00
leiyong 8cead79b18 * Adjust getProjectPairs to getExecutionPairsByProduct. 2020-11-24 10:40:18 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 9b5c484cf9 * Add no product logic. 2020-11-19 17:29:06 +08:00
holan20180123 3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +08:00
leiyong d142a8a69b * Adjust the ajaxGetDropMenu method of the product module. 2020-11-19 10:54:29 +08:00
leiyong b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
leiyong 3272d0c454 * Adjust the test module related code. 2020-11-16 14:50:04 +08:00
leiyong 9950d24d49 * Finish task#8309. 2020-11-13 14:56:59 +08:00
leiyong 29b585ba35 * Finish task#8338. 2020-11-12 11:27:36 +08:00