Commit Graph
39905 Commits
Author SHA1 Message Date
leiyong 6ba36fc282 * Finish task#56387. 2022-06-07 08:16:56 +00:00
孙广明 e26d40da04 Merge branch 'sprint/200_zhouxudong_56363' into 'sprint_200'
* Finish task #56363.

See merge request easycorp/zentaopms!3771
2022-06-07 07:22:15 +00:00
zhouxudong 687f29b7bc * Finish task #56363. 2022-06-07 06:44:49 +00:00
李玉春 6a1f0a9562 Merge branch 'sprint/fixbug_liumengyi_23340' into 'master'
* Fix bug #23340.

See merge request easycorp/zentaopms!3762
2022-06-07 05:28:37 +00:00
王怡栋 444b00343f Merge branch 'master_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3766
2022-06-07 04:13:02 +00:00
tanghucheng 0e24f99f82 * Fix bug for lite. 2022-06-07 12:10:33 +08:00
tanghucheng 97b6196b91 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-07 11:35:20 +08:00
liumengyi 6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
李玉春 cf20ee9361 Merge branch 'sprint/tianshujie_23258' into 'master'
* Fix bug #23258.

See merge request easycorp/zentaopms!3761
2022-06-07 01:47:07 +00:00
tianshujie 3033d3e567 * Fix bug #23258. 2022-06-07 09:42:05 +08:00
李玉春 21c7ec71b5 Merge branch 'fixbug_sunjun_22885' into 'master'
fixbug_sunjun_22885

See merge request easycorp/zentaopms!3752
2022-06-07 01:13:09 +00:00
李玉春 0da04fca77 Merge branch 'sprint/scx_executionbug' into 'master'
* Fix bug #23291.

See merge request easycorp/zentaopms!3748
2022-06-07 01:12:52 +00:00
李玉春 9d1276c73a Merge branch 'sprint/tianshujie_bug23335' into 'master'
* Fix bug #23335.

See merge request easycorp/zentaopms!3760
2022-06-07 01:02:23 +00:00
李玉春 61142f9f67 Update managemembers.js 2022-06-07 01:01:59 +00:00
tianshujie 020528cdbb * Fix bug #23335. 2022-06-07 08:59:51 +08:00
王怡栋 3206d611d4 Merge branch 'master_xieqiyu_23116' into 'master'
* Fix bug#23116.

See merge request easycorp/zentaopms!3757
2022-06-07 00:57:45 +00:00
tianshujie d2242277e7 * Fix bug #23335. 2022-06-07 08:57:24 +08:00
李玉春 4bb6bf8843 Merge branch 'fixbug_sunjun_23101' into 'master'
fixbug_sunjun_23101

See merge request easycorp/zentaopms!3737
2022-06-07 00:52:50 +00:00
李玉春 189af78ca7 Merge branch 'sprint/scx_recordestimate' into 'master'
* Modify taskrecordestimate api.

See merge request easycorp/zentaopms!3735
2022-06-07 00:51:58 +00:00
李玉春 91f7d07cd5 Merge branch 'sprint/fixbug_liumengyi_23290' into 'master'
* Fix bug #23327.

See merge request easycorp/zentaopms!3759
2022-06-06 09:30:11 +00:00
liumengyi 645d5230da * Fix bug #23327. 2022-06-06 17:28:54 +08:00
tanghucheng 1705f5c756 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-06 17:18:04 +08:00
xieqiyu 36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
孙广明 6b9c4f9deb Merge branch 'sprint/fixbug_liumengyi_23271' into 'master'
* Fix bug #23271.

See merge request easycorp/zentaopms!3756
2022-06-06 08:50:48 +00:00
孙广明 05fad2dfbb Merge branch 'sprint/fixbug_liumengyi_23290' into 'master'
* Fix bug #23290.

See merge request easycorp/zentaopms!3753
2022-06-06 08:50:26 +00:00
孙广明 284a43c780 Merge branch 'fix_bug#23320' into 'master'
* Fix bug #23320.

See merge request easycorp/zentaopms!3755
2022-06-06 08:35:03 +00:00
liumengyi 5c552b5dff * Fix bug #23271. 2022-06-06 16:34:32 +08:00
孙广明 4faa6d598d Merge branch 'sprint/tianshujie_bug23113' into 'master'
* Fix bug #23113.

See merge request easycorp/zentaopms!3754
2022-06-06 08:34:27 +00:00
mayue d5bc70122f * Fix bug #23320. 2022-06-06 16:33:00 +08:00
tianshujie 2e9e3ccebd * Fix bug #23113. 2022-06-06 16:31:40 +08:00
liumengyi e40d982355 * Fix bug #23290. 2022-06-06 16:15:39 +08:00
sunjun 13f565ed69 fixbug_sunjun_22885 2022-06-06 08:14:04 +00:00
王怡栋 415c8be249 Merge branch 'master_xieqiyu_23156' into 'master'
* Fix bug#23156.

See merge request easycorp/zentaopms!3746
2022-06-06 07:56:56 +00:00
王怡栋 5ec3176d45 Merge branch 'master_xieqiyu_23083' into 'master'
* Fix bug#23083.

See merge request easycorp/zentaopms!3750
2022-06-06 07:49:26 +00:00
李玉春 fd356fbb99 Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master'
* fix kanban lane height with auto height option.

See merge request easycorp/zentaopms!3747
2022-06-06 07:11:13 +00:00
李玉春 35f14676f9 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3749
2022-06-06 07:10:50 +00:00
tianshujie 814f1a597f * Fix bug #23255. 2022-06-06 15:07:57 +08:00
宋辰轩 9ff12274e2 * Fix bug #23291. 2022-06-06 15:00:09 +08:00
Hao Sun 29ae8cb398 * fix kanban lane height with auto height option. 2022-06-06 06:58:38 +00:00
宋辰轩 7b19aa7af8 * Modify. 2022-06-06 14:29:21 +08:00
孙广明 a5ebd1f530 Merge branch 'sprint/197_liumengyi_upgrade' into 'master'
* Optimize code of task #55677.

See merge request easycorp/zentaopms!3745
2022-06-06 06:24:27 +00:00
liumengyi d37b120fca * Optimize code of task #55677. 2022-06-06 14:22:51 +08:00
王怡栋 d55d51c5f2 Merge branch 'master_xieqiyu_23159' into 'master'
* Fix bug#23159.

See merge request easycorp/zentaopms!3743
2022-06-06 06:22:11 +00:00
王怡栋 377ed72c92 Merge branch 'sprint/master_lanzongjun_fixbug_new' into 'master'
* finish bug #23282

See merge request easycorp/zentaopms!3744
2022-06-06 06:21:25 +00:00
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
tianshujie 246d0f8654 * Fix bug #23259. 2022-06-06 14:15:07 +08:00
孙广明 7a9d13b62c Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23289.

See merge request easycorp/zentaopms!3742
2022-06-06 06:07:50 +00:00
tianshujie 6635e019cf * Fix bug #23289. 2022-06-06 14:01:55 +08:00
王怡栋 f147c6dcc4 Merge branch 'sgm_fixbug' into 'master'
* Fix bugs.

See merge request easycorp/zentaopms!3741
2022-06-06 05:55:50 +00:00