Commit Graph
4436 Commits
Author SHA1 Message Date
王怡栋 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
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08: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 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00: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
dongli c808b52681 * Fix bug #26715. 2022-09-01 07:21:09 +00:00
dongli a711704373 * Fix bug #26715. 2022-09-01 07:04:16 +00:00
dongli c355db3d3d * Fix bug #26715. 2022-09-01 02:49:49 +00:00
dongli 9fac11a5de * Fix bug #26715. 2022-09-01 02:34:21 +00:00
hufangzhou aa7fec1a32 * Fix bug #25898. 2022-08-31 17:08:38 +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
xieqiyu 6cfb7f414f * Fix bug#27042. 2022-08-30 14:32:54 +08: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 0d4b77197f * Fix bug #26936. 2022-08-29 14:49:33 +08:00
liumengyi 6db1eac73f * Finish task #66938. 2022-08-29 11:07:47 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
王怡栋 03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
王怡栋 0036bac572 Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.

See merge request easycorp/zentaopms!5047
2022-08-24 00:46:46 +00:00
dongli f3b8e63376 * Finsh task #64972,64973,64969. 2022-08-23 10:46:03 +00:00
liuhong 329238d8cd *Fix bug #26000. 2022-08-23 09:23:09 +00:00
王怡栋 2a49655e2d Merge branch 'sprint/master_zhouxudong_update64888' into 'master'
* Optimization task #64888.

See merge request easycorp/zentaopms!5037
2022-08-23 01:49:31 +00:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
zhouxudong 005533579d * Update code. 2022-08-22 06:02:02 +00:00
zhouxudong fad466d711 * Batch edit append ignore prompt. 2022-08-22 05:05:49 +00:00
zhouxudong a49c03134c * Batch edit append ignore prompt. 2022-08-22 05:04:47 +00:00
zhouxudong a4bb6e0c3e * Batch edit append ignore prompt. 2022-08-22 04:06:20 +00:00
zhouxudong 41862bf81c * Batch edit append ignore. 2022-08-22 02:20:05 +00:00
zhouxudong faf66f2d63 * Optimization task #64888. 2022-08-19 07:51:38 +00:00
liuhong 7d89582ab7 *Fix bug #26000. 2022-08-19 07:10:02 +00:00
zhouxudong 000f8842e8 * Fix bug. 2022-08-19 06:55:39 +00:00
dongli e3800e4e49 * Finish task #64969. 2022-08-19 05:31:03 +00:00
dongli 9fa036cb34 Revert "* Finish task #64969."
This reverts commit bacc10ccc0.
2022-08-19 05:31:02 +00:00
dongli 93adfc3971 * Finish task #64969. 2022-08-19 05:31:02 +00:00
王怡栋 861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
zhouxudong 9dbfa8b99b * FInish task #64882. 2022-08-19 02:22:42 +00:00
zhouxudong 0a3c297b43 * Finish task #64882. 2022-08-19 02:18:16 +00:00
zhouxudong 3435040a3f * Finish task #64882. 2022-08-19 01:55:48 +00:00
王怡栋 5d28a2973f Merge branch 'sprint/229' into 'master'
Sprint/229

See merge request easycorp/zentaopms!5018
2022-08-19 00:50:35 +00:00
zhouxudong 9883b69c7d * Finish task #64882. 2022-08-18 09:21:35 +00:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
zhouxudong 39007e35b2 Merge branch 'sprint/229_zhouxudong_64888' into sprint/229 2022-08-17 07:15:55 +00:00
王怡栋 3a3477b3c3 Merge branch 'sprint/master_zhouxudong_63580' into 'sprint/229'
Sprint/master zhouxudong 63580

See merge request easycorp/zentaopms!4986
2022-08-17 06:43:24 +00:00
zhouxudong fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
zhouxudong 5c71d7d0b3 * Finish task #63580. 2022-08-17 02:10:45 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00