Commit Graph
45050 Commits
Author SHA1 Message Date
胡方舟 55434f884f Merge branch 'sprint/241_tianshujie_70008' into 'master'
Sprint/241 tianshujie 70008

See merge request easycorp/zentaopms!5501
2022-09-23 02:33:49 +00:00
tianshujie b8206c973d * Finish task #70008. 2022-09-23 10:32:19 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
王怡栋 52d06144b4 Merge branch 'sprint/wangzemei/70012' into 'master'
Sprint/wangzemei/70012

See merge request easycorp/zentaopms!5500
2022-09-23 02:07:21 +00:00
王怡栋 16d1f76ca0 Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.

See merge request easycorp/zentaopms!5499
2022-09-23 02:04:15 +00:00
王怡栋 d2ae5b0e55 Merge branch 'sprint/wangzemei/27809' into 'master'
* fix bug 27809

See merge request easycorp/zentaopms!5492
2022-09-23 02:01:14 +00:00
wangzemei 120c0cbff7 * rebuild green style 2022-09-23 09:56:18 +08:00
wangzemei 217b39d707 * modify color 2022-09-23 09:52:50 +08:00
wangzemei 97ba2c0b2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/70012 2022-09-23 09:48:34 +08:00
曹延义 a02d6c751e * Optimize record style. 2022-09-23 09:46:31 +08:00
wangzemei 1a6acdf943 * rebuild zui 2022-09-23 09:43:49 +08:00
曹延义 ee0eafe9c6 * Optimize record estimate style. 2022-09-23 09:32:18 +08:00
王怡栋 c77ee31e31 Merge branch 'sprint/hufangzhou_feedback_863' into 'master'
* Handle feedback #863.

See merge request easycorp/zentaopms!5438
2022-09-23 01:23:43 +00:00
hufangzhou 0fdb6ddcf8 * Format the code. 2022-09-23 09:21:30 +08:00
王怡栋 510c516713 Merge branch 'sprint/wangzemei/27814' into 'master'
* fix bug 27814 about reviewedBy width

See merge request easycorp/zentaopms!5493
2022-09-23 01:20:34 +00:00
王怡栋 e63d19bee5 Merge branch 'bug_zhouxin_27810' into 'master'
* Fix bug #27810.

See merge request easycorp/zentaopms!5496
2022-09-23 01:20:22 +00:00
王怡栋 13c1c783ff Merge branch 'sprint/241_tianshujie_task' into 'master'
* Finish task #70096.

See merge request easycorp/zentaopms!5497
2022-09-23 01:20:00 +00:00
王怡栋 065f73ffa2 Merge branch 'sprint/hufangzhou_makefile' into 'master'
* Compatible with Zen Tao's table structure.

See merge request easycorp/zentaopms!5462
2022-09-23 01:18:08 +00:00
tianshujie 3d210a3666 * Finish task #70098. 2022-09-23 09:15:01 +08:00
王怡栋 3d756f3771 Merge branch 'master_xieqiyu_27797' into 'master'
* Fix bug#27797.

See merge request easycorp/zentaopms!5490
2022-09-23 01:05:45 +00:00
王怡栋 504e24ffff Merge branch 'sprint/241_dyl_70023' into 'master'
* task #70023, adjust danger label position.

See merge request easycorp/zentaopms!5482
2022-09-23 01:04:31 +00:00
zhouxin b89105265f * Fix bug #27810. 2022-09-23 09:00:13 +08:00
wangzemei 6795fba948 * rebuild zui 2022-09-23 08:34:00 +08:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 4908ead6e8 * Finish task #70098. 2022-09-22 18:03:03 +08:00
wangzemei aa3c858053 * fix bug 27814 about reviewedBy width 2022-09-22 17:35:43 +08:00
tianshujie 500078a229 * Finish task #70096. 2022-09-22 17:31:40 +08:00
wangzemei 2e6404d821 * fix assignedToAB 2022-09-22 17:27:31 +08:00
wangzemei a1356bb29a * fix bug 27809 2022-09-22 17:24:58 +08:00
孙广明 8189cba66c Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5491
2022-09-22 09:15:44 +00:00
dingyongliang 6de9161ff0 * change kanban tabs cursor. 2022-09-22 09:15:32 +00:00
tianshujie 52fb3e71f7 * Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096. 2022-09-22 16:58:27 +08:00
李玉春 29a4e33369 Merge branch 'sprint/cyy_70095' into 'master'
* Finish task #70095.

See merge request easycorp/zentaopms!5486
2022-09-22 08:56:33 +00:00
wangzemei a1b81e7215 * fix style cover 2022-09-22 16:49:24 +08:00
李玉春 749463b85b Merge branch 'sprint/241_dyl_70026' into 'master'
* task #70026, replace more icon.

See merge request easycorp/zentaopms!5481
2022-09-22 08:39:23 +00:00
曹延义 e500e05598 * Finish task #70093. 2022-09-22 16:21:56 +08:00
曹延义 b82fe4e667 * Finish task #70099. 2022-09-22 16:00:42 +08:00
xieqiyu a49b349d80 * Fix bug#27797. 2022-09-22 07:52:43 +00:00
wangzemei 7ddb32ac5a * fix build 2022-09-22 15:39:27 +08:00
曹延义 0ece96c860 * Finish task #70100. 2022-09-22 15:23:18 +08:00
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
wangzemei cc67adfbf1 * fix build 2022-09-22 15:14:08 +08:00
wangzemei c343c47331 * update.min.css 2022-09-22 15:04:42 +08:00
dingyongliang 5525ee47a4 * set confirmed field center. 2022-09-22 07:03:57 +00:00
tianshujie f97e85ee2f * Fix bug #27687. 2022-09-22 14:55:34 +08:00
tianshujie 63fc7c0595 * Fix bug #27688. 2022-09-22 14:54:07 +08:00
dingyongliang 7416757b1d * task #70023, adjust danger label position. 2022-09-22 06:40:37 +00:00
wangzemei 27e3f72b08 * add blue about #70012 2022-09-22 14:36:27 +08:00