Commit Graph
44616 Commits
Author SHA1 Message Date
朱金勇 da5f72ad2e Merge branch 'sprint/return' into 'master'
* Fix return value declaration error of getFeishuData.

See merge request easycorp/zentaopms!5260
2022-09-05 00:19:14 +00:00
Lufei 51bd204786 * Fix return value declaration error of getFeishuData. 2022-09-03 09:58:36 +08:00
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
王怡栋 158bd704f8 Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug #27135,#27034.

See merge request easycorp/zentaopms!5255
2022-09-02 09:08:48 +00:00
liumengyi 623aa4ef63 * Fix bug. 2022-09-02 17:07:52 +08:00
liumengyi 823a9af768 * Fix bug. 2022-09-02 17:03:56 +08:00
王怡栋 5cad8843e7 Merge branch 'master_xieqiyu_27244' into 'master'
* Fix bug#27244.

See merge request easycorp/zentaopms!5257
2022-09-02 08:38:50 +00:00
liumengyi 4274a50e94 * Fix bug #27034. 2022-09-02 16:25:51 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
liumengyi 87d7696f90 * Fix bug #27135. 2022-09-02 14:19:47 +08:00
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming dbcc64cc4c * Add order to effort. 2022-09-02 14:05:14 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
孙广明 547879695e Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug #27238, and fix bug for set switcher.

See merge request easycorp/zentaopms!5253
2022-09-02 05:49:05 +00:00
liumengyi c5e91ea120 * Optimize code for bug #27238. 2022-09-02 13:48:24 +08:00
liumengyi 3509477e6b * Fix bug #27238, and fix bug for set switcher. 2022-09-02 13:44:45 +08:00
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master'
* Code for task#66955.

See merge request easycorp/zentaopms!5245
2022-09-02 05:07:46 +00:00
王怡栋 413c6d64ba Merge branch 'sprint/hufangzhou_26131' into 'master'
* Fix bug #26131.

See merge request easycorp/zentaopms!5244
2022-09-02 05:04:18 +00:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 2e870f698b * Fix bug #27225. 2022-09-02 04:32:07 +00:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
孙广明 660f9ca5f9 Merge branch 'sprint/235_liumengyi_731' into 'master'
* Fix issue #731.

See merge request easycorp/zentaopms!5248
2022-09-02 03:30:51 +00:00
liumengyi 7b4a22093c * Fix issue #731. 2022-09-02 11:29:49 +08:00
王怡栋 17b58bc39b Merge branch 'sprint/235_liutian_fixissue' into 'master'
* Fix issue #731, #728, #727, #726.

See merge request easycorp/zentaopms!5247
2022-09-02 02:57:35 +00:00
liumengyi 26ba81c2a6 * Optimize code. 2022-09-02 10:56:48 +08:00
wangyidong 908b539e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-02 10:49:55 +08:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
liumengyi f667c53c82 * Fix issue #731. 2022-09-02 10:46:07 +08:00
管西迎 f3902cda3d Update .gitlab-ci.yml file 2022-09-02 02:00:50 +00:00
xieqiyu 62e9b5aa44 * Code for task#66955. 2022-09-02 09:44:14 +08:00
hufangzhou c64c9bbf3e * Fix bug #26131. 2022-09-02 09:32:41 +08:00
liumengyi 65e3fc9034 * Fix issue #731. 2022-09-02 09:11:42 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
wangyidong d4cd0de865 * adjust for webhook send weixin message. 2022-09-02 09:09:06 +08:00
tianshujie d3fff0d53f * Fix issue #731. 2022-09-02 09:06:42 +08:00
liumengyi c65e90aef7 * Fix issue. 2022-09-02 08:36:51 +08:00
tianshujie f6117cf17f * Fix issue #731. 2022-09-01 17:19:36 +08:00
sunguangming 812cfb68e2 * Convert task team. 2022-09-01 17:17:10 +08:00
tianshujie 606cfedc10 Merge branch 'sprint/235_liutian_fixissue' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu 2022-09-01 16:17:37 +08:00
tianshujie 708494da4e * Fix issue #731. 2022-09-01 16:17:04 +08:00
王怡栋 121e8fc33d Merge branch 'sprint/235_dongli_bug26188' into 'master'
* Fix bug #26188,#26715.

See merge request easycorp/zentaopms!5241
2022-09-01 07:53:43 +00:00
liumengyi 30998f7add * Finish task #66996. 2022-09-01 15:47:42 +08:00
dongli 51853ef523 * Fix bug #26188. 2022-09-01 07:42:29 +00:00
dongli c808b52681 * Fix bug #26715. 2022-09-01 07:21:09 +00:00
tianshujie c1611935ba * Resolve issue #728. 2022-09-01 15:19:34 +08:00
liumengyi e2d484c49d * Fix issue #726. 2022-09-01 15:12:24 +08:00
dongli a711704373 * Fix bug #26715. 2022-09-01 07:04:16 +00:00
王怡栋 48e11d5186 Merge branch 'sprint/hufangzhou_26458' into 'master'
* Fix bug #26458.

See merge request easycorp/zentaopms!5230
2022-09-01 06:53:53 +00:00