Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
20,146 Commits 2 Branches 292 Tags
0d07b3abaed3d64d7583cbac87b67c049fe3bd11
Commit Graph
962 Commits
Author SHA1 Message Date
z 1d26396b9d * adjust for merge. 2020-11-24 08:49:08 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 6481a780c3 * Fix doc error. 2020-11-20 15:39:21 +08:00
leiyong 9073099a7e * Modify executionPairs to executionIdList. 2020-11-20 14:36:10 +08:00
leiyong 622a4ef4f4 Conflict resolution. 2020-11-20 14:29:07 +08:00
Yagami 90df7cd4dc * Merge code. 2020-11-20 13:09:47 +08:00
tianshujie98 541e72b2bd * Modify variable name. 2020-11-20 10:08:48 +08:00
leiyong 3834ae66ad * Modify programID to projectID. 2020-11-20 09:59:57 +08:00
hufangzhou 8d3ce4acdd Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 09:07:21 +08:00
hufangzhou f49e756aca * Fix a bug. 2020-11-20 09:07:01 +08:00
tianshujie98 c9a91a432a * Change method name. 2020-11-20 08:29:35 +08:00
holan20180123 3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +08:00
holan20180123 77af51dacd * Method renaming 'getParis' to 'getExecutionPairs'. 2020-11-19 15:53:33 +08:00
holan20180123 7c8ec20264 * Rename project to execution. 2020-11-19 15:22:58 +08:00
z 5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
Yagami aae58fea38 * Adjust code details. 2020-11-19 10:41:37 +08:00
leiyong b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
Yagami 0b855e6853 * Fix details. 2020-11-18 13:32:19 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
holan20180123 cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123 bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
tianshujie98 877dc32f88 * Finish task #8393. 2020-11-17 13:33:20 +08:00
holan20180123 7e6e5c40ae Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-17 13:19:24 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
leiyong d86cd9420c * Modify document query error data. 2020-11-17 09:43:41 +08:00
tianshujie98 48f7bf3bf3 * Adjust code style. 2020-11-17 08:41:39 +08:00
leiyong caba144ce0 * Adjust code. 2020-11-16 17:47:21 +08:00
tianshujie98 b13a57d82b * Adjust code style. 2020-11-13 16:44:43 +08:00
tianshujie98 ec58e2b528 * Adjust code style. 2020-11-13 14:16:33 +08:00
leiyong 90f9182ddc * Adjust the doc module. 2020-11-13 09:58:53 +08:00
holan20180123 ea9c93ba1c * Finish task #8194. 2020-11-13 09:18:26 +08:00
holan20180123 583790a08e * Finish task #8194. 2020-11-13 09:08:04 +08:00
leiyong 1065817f17 * Adjust the doc module code. 2020-11-12 18:25:05 +08:00
holan20180123 3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123 4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +08:00
holan20180123 e9286e13d8 * Finish task #8194. 2020-11-12 11:04:17 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
tianshujie98 6ec4c302ba * Adjust code style. 2020-11-06 15:03:19 +08:00
tianshujie98 3bc0854f51 * Adjust code style. 2020-11-06 14:59:05 +08:00
tianshujie98 97cc8034be * Adjust code style. 2020-11-06 13:06:22 +08:00
tianshujie98 8a15ec21d9 * Fix bug. 2020-11-05 15:52:31 +08:00
tianshujie98 1db241cb43 * Fix bug. 2020-11-05 15:30:33 +08:00
tianshujie98 b400af6ffc * Finish task #8262. 2020-11-04 14:07:15 +08:00
tianshujie98 770309794d * Add comment. 2020-11-04 10:12:49 +08:00
tianshujie98 1dd736e9ed * Finish task #8264. 2020-11-04 10:05:51 +08:00
hufangzhou 18bd8a6e26 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 17:41:51 +08:00
hufangzhou 7ef58a2d40 * Add the title of the doc. 2020-11-03 17:41:31 +08:00