Commit Graph

492 Commits

Author SHA1 Message Date
holan20180123
7b5ea8ebb8 * Finish task #9002. 2021-01-15 10:46:33 +08:00
Yagami
38fd427535 * Fix bug details. 2020-12-24 09:26:49 +08:00
leiyong
48c725fe44 * Adjust code. 2020-12-18 11:27:19 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
leiyong
3ae0d54676 * Fix bug. 2020-12-11 16:26:47 +08:00
leiyong
38867fc96c * Fix bug#3749. 2020-12-11 13:02:43 +08:00
wangyidong
8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
tianshujie98
22370a74ec * Fix bug #3697. 2020-12-03 09:33:54 +08:00
tianshujie98
b8b305000e * Fix bug #3697. 2020-12-03 09:04:27 +08:00
tianshujie98
b85c3b7abc * Fix bug #3686. 2020-12-02 14:39:23 +08:00
tianshujie98
b48f4d444d * Fix bug #3686. 2020-12-02 10:52:17 +08:00
holan20180123
2fdf26bc21 * Finisht task #8497. 2020-11-27 10:27:08 +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
holan20180123
4d842f4ec7 * Init products. 2020-11-19 17:19:55 +08:00
holan20180123
ec3a2ff4ff * Init products. 2020-11-19 16:44:58 +08:00
holan20180123
3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +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
holan20180123
159cd5c41d * Finish task #8194. 2020-11-10 10:34:08 +08:00
Yagami
227d6c8211 * Adjust code detail. 2020-11-02 14:31:47 +08:00
holan20180123
3552c61432 * Fix bug #2490. 2020-11-02 10:11:43 +08:00
holan20180123
37c672a2ed * Fix bug #2490. 2020-11-02 10:08:23 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
holan20180123
35e793260e * Fix bug #12955. 2020-10-29 11:24:18 +08:00
Yagami
d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
tianshujie98
9a8c2c6c56 * Edit comment. 2020-10-10 11:32:44 +08:00
tianshujie98
896c57edba * Edit comment. 2020-10-10 11:23:37 +08:00
tianshujie98
ca54dacb02 * Finish task #8061. 2020-10-10 09:18:10 +08:00
tianshujie98
b6674ed079 * Finish task #8061. 2020-10-10 09:06:42 +08:00
leiyong
81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
z
738878d71f * adjust code. 2020-09-30 13:36:49 +08:00
hufangzhou
da36997ef6 * Finish bug#3488. 2020-09-28 11:30:22 +08:00
holan20180123
a335a811f7 * Finish task #7932. 2020-09-25 14:52:32 +08:00
holan20180123
4b1c0ced7b * Finish task #7932. Fix bug #3422. 2020-09-23 13:55:32 +08:00
holan20180123
d85d370800 * Finish task #7932. Fix bug #3422. 2020-09-23 13:27:08 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
tianshujie98
6edacf0578 * Solve the problem of manpower input block. 2020-09-08 15:21:32 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123
7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
chenfeiCF
586f34b10f * Add toTask field to datatable. 2020-08-21 07:18:54 +00:00
qiyu-xie
3af0fb48dc Fix bug #2543 2020-08-11 14:38:07 +08:00
qiyu-xie
217b456bf9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 16:29:16 +08:00
qiyu-xie
904543b48f * Fix bug #3324. 2020-08-06 16:28:08 +08:00
tianshujie98
548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
leiyong
26b1a0fe92 * Fix bug,task#7549. 2020-07-27 06:43:54 -07:00
leiyong
edf7d6448b * Fix bug,task#7549. 2020-07-27 03:29:59 -07:00
leiyong
e639fd4379 * Finish task#7481. 2020-07-27 02:29:36 -07:00