Commit Graph
2400 Commits
Author SHA1 Message Date
王怡栋 65ed4e9ecb Merge branch 'tanghucheng_task' into 'master'
* Finish task #63794.

See merge request easycorp/zentaopms!4863
2022-08-09 08:27:21 +00:00
李玉春 016ef434ab Merge branch 'sprint/224_tianshujie_63692' into 'master'
Sprint/224 tianshujie 63692

See merge request easycorp/zentaopms!4866
2022-08-09 08:19:33 +00:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tanghucheng fb0cf8c0bb * Code for gantt language. 2022-08-09 14:31:05 +08:00
tanghucheng bbf28d9bc0 * Finish task #63794. 2022-08-09 14:24:01 +08:00
王怡栋 6ba5f3bd67 Merge branch 'master_liuhong_35865' into 'master'
Master liuhong 35865

See merge request easycorp/zentaopms!4857
2022-08-09 05:34:18 +00:00
王怡栋 ff55e9ca2e Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...

See merge request easycorp/zentaopms!4854
2022-08-09 05:33:04 +00:00
王怡栋 19f7a0df69 Merge branch 'sprint/224_liumengyi_63691' into 'master'
* Finish task #63691.

See merge request easycorp/zentaopms!4850
2022-08-09 05:30:07 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
xieqiyu 8a159ba714 * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. 2022-08-09 09:39:58 +08:00
liuhong a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
liumengyi 20a208f1f6 * Finish task #63691. 2022-08-08 13:43:16 +08:00
liumengyi 1d9846d808 * Fix issue #709. 2022-08-08 10:43:38 +08:00
sunguangming 1e05476b43 * Code for kanban action. 2022-08-05 17:35:29 +08:00
王怡栋 8f66bb355b Merge branch 'sprint/master_zhouxudong_bug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4819
2022-08-05 06:46:20 +00:00
王怡栋 a1518aaf67 Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973

See merge request easycorp/zentaopms!4823
2022-08-05 06:45:43 +00:00
liuhong 3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
zhouxudong f6f6dbe5a1 * Fix bug. 2022-08-05 05:34:12 +00:00
孙广明 9f323c631a Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249

See merge request easycorp/zentaopms!4816
2022-08-05 03:34:42 +00:00
liuyongkai 697ecffce7 * Fix bug #26002,25249 2022-08-05 03:29:29 +00:00
liuyongkai 8837c4c100 * Fix bug $26002,25249 2022-08-05 03:08:10 +00:00
王怡栋 3cc4c75950 Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue

See merge request easycorp/zentaopms!4810
2022-08-05 02:34:09 +00:00
孙广明 7cc56886e3 Merge branch 'lyk_25876' into 'master'
* Fix bug 25876.

See merge request easycorp/zentaopms!4793
2022-08-05 02:32:36 +00:00
tianshujie f4147a73a1 * Resolve issue #708. 2022-08-05 10:24:12 +08:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
liuyongkai 7ca2f66a28 * Fix bug #26002,25249 2022-08-04 10:26:46 +00:00
wangyuting2 f477e3cf1c * Add execution bug approval menu. 2022-08-04 14:48:51 +08:00
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
王怡栋 fc494cc0f6 Merge branch 'sprint/221_tianshujie_fixbug' into 'master'
Sprint/221 tianshujie fixbug

See merge request easycorp/zentaopms!4781
2022-08-04 02:34:54 +00:00
tianshujie e0aaa4c18c * Fix bug #26008. 2022-08-04 09:28:18 +08:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
李玉春 ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
tianshujie b4a394718f * Finish task #62947. 2022-08-03 14:49:42 +08:00
tianshujie 6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +08:00
liumengyi 2c108bcf16 * Fix bug #25987. 2022-08-03 14:06:17 +08:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
liumengyi fc60a3f503 * Fix bug #25964. 2022-08-03 13:16:42 +08:00
liuyongkai eac5c92fde * Fix bug 25876. 2022-08-03 03:29:12 +00:00
王怡栋 1d59e34b07 Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg

See merge request easycorp/zentaopms!4751
2022-08-03 02:12:38 +00:00
王怡栋 9bb4369d7b Merge branch 'sprint/221_liumengyi_62935' into 'master'
* Finish task #62935.

See merge request easycorp/zentaopms!4748
2022-08-03 01:21:03 +00:00
liumengyi 6d019f65e5 * Fix bug for task #62935. 2022-08-03 08:39:25 +08:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
dongli b664ed8b43 * Fix bug #25851 2022-08-02 07:03:57 +00:00
wangyuting2 dc14d91320 * Finish task #63286. 2022-08-02 14:54:20 +08:00
dongli 80753ec1f0 * Fix bug #25851. 2022-08-02 06:41:48 +00:00
liumengyi dd2c92fb9d * Finish task #62935. 2022-08-01 15:41:14 +08:00