Commit Graph
1351 Commits
Author SHA1 Message Date
wangyidong cf1399e0f6 * adjust for unit test. 2022-09-08 11:35:25 +08:00
wangyidong e0248af2a4 * adjust code. 2022-09-07 15:57:20 +08:00
wangyidong 4092d95876 * code for task #68204. 2022-09-07 15:01:27 +08:00
wangyidong a8a703bf16 * finish task #68203. 2022-09-07 11:08:48 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
liumengyi ed38cf6969 * Fix bug #25409. 2022-09-05 14:31:53 +08:00
tianshujie dd1feb1a04 * Fix bug #24894. 2022-09-05 13:25:01 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
liumengyi 18efebc505 * Fix bug. 2022-08-26 15:33:46 +08:00
liuhong c14d0ed155 *Fix bug before #64879. 2022-08-26 02:04:50 +00:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
sunguangming 7fe8456f4f * Code for build locate bug. 2022-08-23 08:33:17 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
liuhong f0cdfea18a *Fix bug 2022-08-19 02:39:40 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
wangyidong 28328da15c Merge branch 'sprint/zentaopms230' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms230 2022-08-17 13:07:52 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
sunguangming 749d5f7375 * Code for weekly. 2022-08-16 10:48:47 +08:00
tianshujie 396673bd6d * Refactor the getStats method under the project. 2022-08-15 18:57:50 +08:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
tianshujie 51608525d2 * Modified testcase of block. 2022-08-13 13:43:15 +08:00
tianshujie 7a1851e7ef * Fix bug #26195. 2022-08-10 10:33:02 +08:00
zenggang 262ab9e5cd * Fix sprint211 problems. 2022-08-05 05:19:47 +00:00
tianshujie fb8185dd2b * Fix bug #25732. 2022-08-04 14:37:05 +08:00
tianshujie b73c5fb933 * Fix bug #25732. 2022-08-04 14:19:12 +08:00
tianshujie 02f02fc291 * Fix bug #25732. 2022-08-04 14:17:18 +08:00
sunguangming ffc90d43b0 * Code for my-block. 2022-08-02 14:13:37 +08:00
liumengyi c9753f5490 * Fix bug #25814. 2022-07-28 13:22:32 +08:00
zenggang 56b4e30328 * Code for task#61964 2022-07-27 06:45:26 +00:00
tianshujie ca01a7540b * Fix bug #25732. 2022-07-27 13:40:43 +08:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
zhouxudong c23aa4ddb5 * Finish task #61906. 2022-07-25 07:16:34 +00:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
zhouxudong 95dba9297d * Fix bug #24894. 2022-07-15 05:43:51 +00:00
liumengyi 139b6b4f40 * Fix bug #25289. 2022-07-14 16:04:03 +08:00
孙广明 d8e313669e Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474

See merge request easycorp/zentaopms!4503
2022-07-13 05:10:46 +00:00
zhouxudong 2196d2746d * Finish task #60388. 2022-07-12 01:05:21 +00:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
刘刚 f37e8309a3 Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.

See merge request easycorp/zentaopms!4444
2022-07-08 09:34:43 +00:00
liuruogu 3f7f25dd8a * Finish task #59641. 2022-07-08 09:20:14 +00:00
刘刚 263419df29 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24959.

See merge request easycorp/zentaopms!4403
2022-07-07 03:13:21 +00:00
liuruogu 15d87d68e4 * Fix bug #24959. 2022-07-07 03:12:51 +00:00
liuruogu bf62f6fa75 * Fix bug #24959. 2022-07-07 03:03:59 +00:00
王怡栋 4eb9fb5904 Merge branch 'master_xieqiyu_23949' into 'master'
* Fix bug#23949.

See merge request easycorp/zentaopms!4360
2022-07-06 01:48:28 +00:00
zhouxudong 7a9f685ecf * Finish task #59533. 2022-07-06 01:13:31 +00:00