 liuyongkai
|
0c9b2f4e94
|
* Fix ui.
|
2022-09-23 06:49:28 +00:00 |
|
|
王怡栋
|
bb5b178c49
|
Merge branch 'master_liuhong_27190' into 'master'
*Fix bug #27190.
See merge request easycorp/zentaopms!5516
|
2022-09-23 05:52:56 +00:00 |
|
|
王怡栋
|
423dfcd7e9
|
Merge branch 'cyy_bug' into 'master'
* Modify edit multi task.
See merge request easycorp/zentaopms!5512
|
2022-09-23 05:50:19 +00:00 |
|
|
王怡栋
|
a55c511bab
|
Merge branch 'sprint/241_dyl_70014' into 'master'
* task #70014, rm zebra bg.
See merge request easycorp/zentaopms!5515
|
2022-09-23 05:49:38 +00:00 |
|
|
liuhong
|
047cd27da8
|
*Fix bug #27190 for adjust code.
|
2022-09-23 05:43:34 +00:00 |
|
|
曹延义
|
2b13096af4
|
* Fix bug #27615 and adjust code.
|
2022-09-23 13:43:05 +08:00 |
|
|
liuhong
|
9f309bdeab
|
*Fix bug #27190.
|
2022-09-23 05:39:06 +00:00 |
|
|
dingyongliang
|
09e50c54e8
|
* task #70014, rm zebra bg.
|
2022-09-23 05:35:11 +00:00 |
|
|
孙广明
|
94e18345cb
|
Merge branch 'feedback_lyk_953' into 'master'
* Fix export excel bugs.
See merge request easycorp/zentaopms!5480
|
2022-09-23 05:09:48 +00:00 |
|
|
曹延义
|
7488846987
|
* Modify budget calc.
|
2022-09-23 13:01:45 +08:00 |
|
|
曹延义
|
8ce8855258
|
* Modify edit multi task.
|
2022-09-23 11:52:00 +08:00 |
|
|
王怡栋
|
41500abcc2
|
Merge branch 'sprint/cyy_bug' into 'master'
Sprint/cyy bug
See merge request easycorp/zentaopms!5511
|
2022-09-23 03:36:55 +00:00 |
|
|
胡方舟
|
8aac1004fa
|
Merge branch 'sprint/wangzemei/70008' into 'master'
* rebuild zui
See merge request easycorp/zentaopms!5510
|
2022-09-23 03:34:05 +00:00 |
|
|
曹延义
|
8eef51bf19
|
* Fix bug #27856.
|
2022-09-23 11:22:58 +08:00 |
|
|
曹延义
|
5667c2cade
|
* Fix bug #27854.
|
2022-09-23 11:22:36 +08:00 |
|
|
wangzemei
|
2d2693946d
|
* rebuild zui
|
2022-09-23 11:17:08 +08:00 |
|
|
王怡栋
|
4d635243bc
|
Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug
See merge request easycorp/zentaopms!5509
|
2022-09-23 03:16:41 +00:00 |
|
|
王怡栋
|
5391424068
|
Merge branch 'sprint/wangzemei/27863' into 'master'
* fix bug 27863
See merge request easycorp/zentaopms!5507
|
2022-09-23 03:15:44 +00:00 |
|
|
tianshujie
|
8bfb9344fb
|
* Fix bug #27561.
|
2022-09-23 11:14:09 +08:00 |
|
|
王怡栋
|
24756f456b
|
Merge branch 'leiyong_fix_wenhook_0923' into 'master'
leiyong_fix_wenhook_0923* Fix feedback#967.
See merge request easycorp/zentaopms!5508
|
2022-09-23 03:13:29 +00:00 |
|
|
tianshujie
|
4ff7d428a9
|
* Resolve issue #737.
|
2022-09-23 10:57:35 +08:00 |
|
|
leiyong
|
e2f4d52e61
|
* Fix feedback#967.
|
2022-09-23 02:55:18 +00:00 |
|
|
wangzemei
|
20ccc81a8a
|
* fix bug 27863
|
2022-09-23 10:52:47 +08:00 |
|
|
tianshujie
|
a6cdf518d2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_fixbug
|
2022-09-23 10:39:27 +08:00 |
|
|
胡方舟
|
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 |
|
|
tianshujie
|
95ed6665d8
|
* Fix bug #27632.
|
2022-09-23 10:03:53 +08: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 |
|
|
tianshujie
|
85d0124403
|
* Fix bug #27778.
|
2022-09-23 09:48:39 +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 |
|