 liuhong
|
55700db5f3
|
*Fix bug #27970.
|
2022-09-26 13:39:56 +00:00 |
|
|
李玉春
|
d57ed6e651
|
Merge branch 'sprint/tianshujie_27949' into 'master'
* Fix bug #27949.
See merge request easycorp/zentaopms!5550
|
2022-09-26 09:03:00 +00:00 |
|
|
tianshujie
|
fa4fee7fbb
|
* Fix bug #27949.
|
2022-09-26 16:54:36 +08:00 |
|
|
孙广明
|
09f4edd61f
|
Merge branch 'liyuchun_fixbug_27962' into 'master'
* Fix bug #27962.
See merge request easycorp/zentaopms!5549
|
2022-09-26 08:52:24 +00:00 |
|
|
liyuchun
|
6a60c85dc8
|
* Fix bug #27962.
|
2022-09-26 16:50:58 +08:00 |
|
|
sunguangming
|
ac8f6c9413
|
* Code for task effort bug.
|
2022-09-26 14:50:04 +08:00 |
|
|
李玉春
|
8e1b4f7819
|
Merge branch 'sprint/wangzemei/green_flower' into 'master'
* add green theme flower
See merge request easycorp/zentaopms!5540
|
2022-09-26 03:24:10 +00:00 |
|
|
wangzemei
|
8596c89ebe
|
* add green theme flower
|
2022-09-26 11:20:40 +08:00 |
|
|
李玉春
|
eb56ce4fbc
|
Merge branch 'sprint/241_tianshujie_bug' into 'master'
Sprint/241 tianshujie bug
See merge request easycorp/zentaopms!5526
|
2022-09-26 00:57:39 +00:00 |
|
|
李玉春
|
6ec4879cd9
|
Merge branch 'sprint/241_wangzemei_fix' into 'master'
* fix style
See merge request easycorp/zentaopms!5536
|
2022-09-26 00:50:30 +00:00 |
|
|
wangzemei
|
483a8e4c96
|
* fix style
|
2022-09-26 08:45:23 +08:00 |
|
|
王怡栋
|
a728c2e90c
|
Merge branch 'fixbug' into 'master'
* Fix bug #27891,27610.
See merge request easycorp/zentaopms!5535
|
2022-09-26 00:38:39 +00:00 |
|
|
tanghucheng
|
142da875c3
|
* Fix bug #27891,27610.
|
2022-09-26 08:36:57 +08:00 |
|
|
李玉春
|
080972f771
|
Merge branch 'sprint/241_wangzemei_27863' into 'master'
* modify style about green
See merge request easycorp/zentaopms!5534
|
2022-09-26 00:29:36 +00:00 |
|
|
wangzemei
|
13d7e26a87
|
* modify style about green
|
2022-09-26 08:26:19 +08:00 |
|
|
tianshujie
|
3a9b2c4952
|
* Modify the SQL.
|
2022-09-26 08:12:53 +08:00 |
|
|
tianshujie
|
e82f1f6d6a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug
|
2022-09-26 08:12:31 +08:00 |
|
|
朱金勇
|
d3911c77e6
|
Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug
See merge request easycorp/zentaopms!5518
|
2022-09-23 16:05:19 +00:00 |
|
|
王怡栋
|
7cbc6a53f0
|
Merge branch 'sprint/241_dyl_70025' into 'master'
Sprint/241 dyl 70025
See merge request easycorp/zentaopms!5531
|
2022-09-23 09:19:03 +00:00 |
|
|
王怡栋
|
f07e15a4b4
|
Merge branch 'master_xieqiyu_27359' into 'master'
* Fix bug#27359.
See merge request easycorp/zentaopms!5530
|
2022-09-23 09:18:16 +00:00 |
|
|
王怡栋
|
98690f8a58
|
Merge branch 'master_xieqiyu_27404' into 'master'
* Fix bug#27404.
See merge request easycorp/zentaopms!5529
|
2022-09-23 09:17:41 +00:00 |
|
|
xieqiyu
|
eed9d18857
|
* Fix bug#27359.
|
2022-09-23 09:02:39 +00:00 |
|
|
xieqiyu
|
9914478a58
|
* Fix bug#27404.
|
2022-09-23 08:54:58 +00:00 |
|
|
王怡栋
|
ccee584e98
|
Merge branch 'master_xieqiyu_27408' into 'master'
* Fix bug#27408.
See merge request easycorp/zentaopms!5528
|
2022-09-23 08:54:46 +00:00 |
|
|
王怡栋
|
34c9b63185
|
Merge branch 'sprint/wzm/27863' into 'master'
Sprint/wzm/27863
See merge request easycorp/zentaopms!5527
|
2022-09-23 08:52:20 +00:00 |
|
|
wangzemei
|
ec56b969ee
|
* merge master
|
2022-09-23 16:51:34 +08:00 |
|
|
dingyongliang
|
b708b328ee
|
* hidden all projects.
|
2022-09-23 08:48:17 +00:00 |
|
|
wangzemei
|
0cc6210a89
|
* fix bug 27863 && 27884
|
2022-09-23 16:44:00 +08:00 |
|
|
王怡栋
|
e1d6f0ac91
|
Merge branch 'master_xieqiyu_27453' into 'master'
* Fix bug$27453.
See merge request easycorp/zentaopms!5524
|
2022-09-23 08:42:34 +00:00 |
|
|
xieqiyu
|
856703675b
|
* Fix bug#27408.
|
2022-09-23 08:42:07 +00:00 |
|
|
王怡栋
|
ab07f6e7d3
|
Merge branch 'sprint/238_hufangzhou_newVersion' into 'master'
* Add the new version
See merge request easycorp/zentaopms!5525
|
2022-09-23 08:39:05 +00:00 |
|
|
tianshujie
|
e553730c29
|
* Finish task #70202.
|
2022-09-23 16:33:56 +08:00 |
|
|
hufangzhou
|
952f0395c9
|
* Add the new version
|
2022-09-23 16:33:40 +08:00 |
|
|
xieqiyu
|
b7d243f0be
|
* Fix bug$27453.
|
2022-09-23 08:32:16 +00:00 |
|
|
dingyongliang
|
4ef4195d34
|
* center c-confirmed.
|
2022-09-23 08:30:24 +00:00 |
|
|
dingyongliang
|
41672b5107
|
* add icon for program.
|
2022-09-23 08:26:53 +00:00 |
|
|
孙广明
|
03c5bbdb19
|
Merge branch 'feedback_lyk_255' into 'master'
* Fix ui.
See merge request easycorp/zentaopms!5521
|
2022-09-23 08:21:12 +00:00 |
|
|
wangyidong
|
a3e0a53b53
|
Merge branch 'sprint/ZUI_guofeilong_updateIcon'
|
2022-09-23 16:08:48 +08:00 |
|
|
wangzemei
|
92a61c069f
|
* fix style
|
2022-09-23 16:07:17 +08:00 |
|
|
tianshujie
|
1cab0bbcc0
|
* Fix bug #27501.
|
2022-09-23 16:03:27 +08:00 |
|
|
tianshujie
|
dfe1c9dc39
|
* Fix bug #27875.
|
2022-09-23 15:54:04 +08:00 |
|
|
liuyongkai
|
ca23350435
|
* Fix ui.
|
2022-09-23 07:49:04 +00:00 |
|
|
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 |
|
|
tianshujie
|
c689dd0f0a
|
* Fix bug #27688.
|
2022-09-23 13:50:36 +08: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 |
|
|
tianshujie
|
a20a8b6cdf
|
* Fix bug #27871.
|
2022-09-23 13:49:57 +08: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 |
|