Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,314 Commits 2 Branches 292 Tags
2dec053c2716d2126c2d964ea72ce78425b80a21
Commit Graph
235 Commits
Author SHA1 Message Date
王怡栋 b1c4645857 Merge branch 'fix_code_error' into 'master' 
* Fix code error.

See merge request easycorp/zentaopms!4853
 2022-08-09 01:56:11 +00:00
mayue 6c8cdaad1f * Fix code error. 2022-08-09 09:50:37 +08:00
wangyidong 2769e53ea0 * adjust for task #63802. 2022-08-09 08:54:42 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
wangyidong 4bf7706d23 * code for task #63802. 2022-08-08 17:35:28 +08:00
mayue fc0a0b2d61 * Optimize code. 2022-08-08 10:56:43 +08:00
mayue fc13fad289 resolve conflict 2022-08-08 10:39:25 +08:00
lanzongjun 8429ff7062 realbegin date fix 2022-08-05 16:04:10 +08:00
lanzongjun 9c6356fded debug 2022-08-05 15:50:24 +08:00
lanzongjun 408150ff5c debug 2022-08-05 15:40:25 +08:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun 7e0c2a23ba fix 2022-08-05 09:56:28 +08:00
lanzongjun 6d52559fd3 fix 2022-08-05 09:26:49 +08:00
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
lanzongjun b74f03c924 fix bug 2022-08-04 17:58:48 +08:00
lanzongjun aa3b287d38 fix bug 2022-08-04 15:34:41 +08:00
lanzongjun f09fd6d981 fix bug resize move 2022-08-04 14:07:02 +08:00
lanzongjun f2d0b3b3b3 resolve conflict 2022-08-04 13:51:27 +08:00
lanzongjun cff20cfe1f * fix bug 2022-08-04 13:50:52 +08:00
mayue 436cf26588 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 13:07:42 +08:00
lanzongjun 9baa2fba54 * fix bug 2022-08-04 13:06:17 +08:00
mayue 58567b28e7 * Finish task #62887. 2022-08-04 11:09:48 +08:00
liuhong c44c768145 *Fix bug #25759 2022-08-04 02:11:40 +00:00
liuhong 2bd5412bb1 *Fix bug #25759 2022-08-04 02:05:07 +00:00
mayue da64ac5a50 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 09:57:07 +08:00
lanzongjun 8ce6a83819 * fix bug 2022-08-04 09:56:03 +08:00
liuhong b2f152d904 *Fix bug #25759 2022-08-04 01:40:59 +00:00
mayue 397c6d55b4 * Optimize code. 2022-08-04 09:38:01 +08:00
liuhong 868ee2d3fe *Fix bug #25759 2022-08-04 01:10:28 +00:00
mayue 37c49204e1 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 09:09:53 +08:00
mayue 0ab5b2956d * Finish task #62892. 2022-08-04 09:07:37 +08:00
lanzongjun 451bffdc26 * finish task #62892 2022-08-03 09:59:01 +08:00
lanzongjun 32edb1c34b Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-03 09:28:53 +08:00
lanzongjun 1ae1352f11 * finish task #62889 2022-08-03 09:28:39 +08:00
mayue 733385c430 * Merge code . 2022-08-02 17:38:48 +08:00
mayue 6ebb39755a * Add some code. 2022-08-02 17:36:44 +08:00
lanzongjun f47ab8a359 * finish task #62889 2022-08-02 17:18:24 +08:00
xieqiyu 22327a069c * Fix bug#25764. 2022-07-27 15:22:20 +08:00
wangyidong 2fc9d11e1b * adjust code for check stage name. 2022-07-26 16:52:41 +08:00
wangyidong 36dd0b9ad5 * adjust for task #61977. 2022-07-26 13:11:32 +08:00
wangyidong c820d66059 * fix bug #25557. 2022-07-22 11:37:12 +08:00
wangyidong 1e800bbb5c * fix bug #25600. 2022-07-22 08:53:27 +08:00
wangyidong b9eca6ff93 * fix bug #25557. 2022-07-22 08:30:10 +08:00
wangyidong 6576f0ccc4 * fix bug #25531,25536,25541,25550,25552,25561 2022-07-21 16:56:14 +08:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
wangyidong fbbbd58cbc * code for task #61200. 2022-07-19 15:36:03 +08:00
wangyidong a61f6a9cc1 * code for task #61189. 2022-07-19 13:34:38 +08:00
wangyidong 837c8f7ec2 * code for task #61188. 2022-07-19 13:10:26 +08:00
孙广明 a09f51348b * Fix lang. 2022-07-14 10:45:29 +08:00