Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
45,894 Commits 2 Branches 292 Tags
7efbb7d6cae5448760dabcdd726488d450aaef6a
Commit Graph
526 Commits
Author SHA1 Message Date
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tanghucheng 83dbebc5b8 * Task#70759 Add relation productID for copyProject. 2022-09-28 11:16:33 +08:00
wangyuting2 80fe821de6 * Finish task #70571. 2022-09-27 01:33:34 +00:00
wangyidong 0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
tianshujie e553730c29 * Finish task #70202. 2022-09-23 16:33:56 +08:00
曹延义 7488846987 * Modify budget calc. 2022-09-23 13:01:45 +08:00
lanzongjun ac75c1ee07 * fix bug #27795 2022-09-23 09:20:14 +08:00
dingyongliang 6f8533ae78 * task #70026, replace more icon. 2022-09-22 06:17:09 +00:00
wangyuting2 12c566a9ab * Optimize code. 2022-09-19 05:42:06 +00:00
wangyidong ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
wangyidong 6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
lanzongjun f8691316b0 * task #69250#69251 2022-09-16 15:31:44 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
lanzongjun 49faebaad7 * task #69250#69251 2022-09-16 14:58:39 +08:00
liugang e885261255 * Don't display the shadow products when create a project, see task #68999. 2022-09-14 14:52:45 +08:00
tianshujie 29bd1d6588 * Update test case of program module. 2022-09-14 10:37:05 +08:00
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
李玉春 0bc581b21c Merge branch 'sprint/235' into 'master' 
Sprint/235

See merge request easycorp/zentaopms!5216
 2022-08-31 08:19:32 +00:00
zenggang 6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
孙广明 1e1ddeb0b0 Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235' 
* Fix bug #26758,  #25942., #23957.

See merge request easycorp/zentaopms!5176
 2022-08-29 06:53:31 +00:00
tianshujie a072b794e5 * Fix bug #26936. 2022-08-29 14:51:21 +08:00
tianshujie 0d4b77197f * Fix bug #26936. 2022-08-29 14:49:33 +08:00
liumengyi 7e60d43f6e * Finish task #66938. 2022-08-29 10:45:50 +08:00
liumengyi fac28b389a * Fix bug #26724. 2022-08-26 16:12:07 +08:00
tanghucheng 24dab5df38 * Fix bug #26906. 2022-08-26 11:30:14 +08:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master' 
Sprint/222

See merge request easycorp/zentaopms!4784
 2022-08-04 03:03:16 +00:00
liuruogu 5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00:00
zhouxudong 2358f42e39 * Finish task #62836 ~ #62849. 2022-08-01 08:13:05 +00:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
xieqiyu 0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
xieqiyu cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
zhouxudong 3e842a6316 * Fix bug #25696. 2022-07-26 08:53:24 +00:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master' 
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
 2022-07-20 09:29:07 +00:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
王怡栋 e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master' 
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
 2022-06-30 01:28:55 +00:00
zhouxudong 298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong 461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
tianshujie b438c9882a * Fix bug #23855. 2022-06-16 16:31:01 +08:00
tianshujie d9731bb06c * Fix bug #23855. 2022-06-16 16:12:37 +08:00
tianshujie 641c13383b * Fix bug #23855. 2022-06-16 16:06:55 +08:00
tianshujie 61d8ccda45 * Fix bug #23855. 2022-06-16 15:37:59 +08:00
xieqiyu 770f4f978d * Fix bug of program list in normal user. 2022-06-15 10:03:14 +08:00