 王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
|
王怡栋
|
4dab93ee3b
|
Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.
See merge request easycorp/zentaopms!4082
|
2022-06-23 00:40:27 +00:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
xieqiyu
|
2703bc9ba7
|
* Finish task#57875.
|
2022-06-23 08:33:37 +08:00 |
|
|
zhouxudong
|
bc416e40fc
|
* Finish task #57864.
|
2022-06-22 10:11:06 +00:00 |
|
|
liumengyi
|
4c5ff19a61
|
* Finish task #58288.
|
2022-06-22 17:01:39 +08:00 |
|
|
王怡栋
|
3b6ecf50ef
|
Merge branch 'sprint/206_tianshujie_57898' into 'master'
* Fix bug #23930.
See merge request easycorp/zentaopms!4071
|
2022-06-22 08:18:35 +00:00 |
|
|
liumengyi
|
b7a32b354b
|
* Finish task #58288.
|
2022-06-22 16:15:06 +08:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
tianshujie
|
20de2fde71
|
* Fix bug #23930.
|
2022-06-22 11:04:10 +08:00 |
|
|
孙广明
|
34ddc497ba
|
Merge branch 'zentaopms_207'
|
2022-06-22 08:33:17 +08:00 |
|
|
朱金勇
|
89357c1100
|
Merge branch 'sprint/wangzemei/bug23265' into 'master'
* Fix bug #23265
See merge request easycorp/zentaopms!4045
|
2022-06-22 00:15:59 +00:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
wangzemei
|
0f30bd5fd9
|
* Fix bug #23265
|
2022-06-21 09:11:46 +00:00 |
|
|
mayue
|
d97b5aeb97
|
* Fix bug #23765.
|
2022-06-21 13:30:00 +08:00 |
|
|
sunjun
|
ca2b45736b
|
codeReview
|
2022-06-17 07:04:52 +00:00 |
|
|
sunjun
|
fec9f4f1dd
|
codeReview
|
2022-06-17 05:05:44 +00:00 |
|
|
leiyong
|
a87a9bc2fb
|
* Edit comments.
|
2022-06-17 02:06:02 +00:00 |
|
|
leiyong
|
ae55e2c31e
|
* Fix bug#23841.
|
2022-06-17 01:30:09 +00:00 |
|
|
leiyong
|
80c03beea7
|
* Fix bug#23821.
|
2022-06-16 11:16:17 +00:00 |
|
|
王怡栋
|
af2b0ef327
|
Merge branch 'master_xieqiyu_23762' into 'master'
* Fix bug#23762.
See merge request easycorp/zentaopms!3989
|
2022-06-16 09:03:19 +00:00 |
|
|
xieqiyu
|
e0a9d3b339
|
* Fix bug#23762.
|
2022-06-16 16:56:57 +08:00 |
|
|
sunjun
|
8b4d326b90
|
fixissue_planIcon
|
2022-06-16 07:57:40 +00:00 |
|
|
tianshujie
|
d351c15090
|
* Fix bug #23828.
|
2022-06-16 13:23:57 +08:00 |
|
|
caoyanyi
|
8d16be79c4
|
* Modify page locate.
|
2022-06-16 12:04:06 +08:00 |
|
|
tianshujie
|
b3e240eda5
|
* Finish task #57095.
|
2022-06-16 10:29:31 +08:00 |
|
|
leiyong
|
fcd6f4c333
|
* Finish task#56932.
|
2022-06-15 10:57:05 +00:00 |
|
|
王怡栋
|
95df7b5e3c
|
Merge branch 'master_xieqiyu_23662' into 'master'
* Fix bug#23662.
See merge request easycorp/zentaopms!3949
|
2022-06-15 09:32:05 +00:00 |
|
|
xieqiyu
|
f460aa58fd
|
* Fix bug#23662.
|
2022-06-15 17:07:18 +08:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
王怡栋
|
a6b264d1a7
|
Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926
See merge request easycorp/zentaopms!3942
|
2022-06-15 08:20:11 +00:00 |
|
|
tianshujie
|
520ab92338
|
* Finish task #57095.
|
2022-06-15 16:17:16 +08:00 |
|
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
|
tianshujie
|
2c176439d3
|
* Finish task #57095.
|
2022-06-15 15:09:34 +08:00 |
|
|
孙广明
|
9df2853a61
|
Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094
See merge request easycorp/zentaopms!3928
|
2022-06-15 03:09:37 +00:00 |
|
|
sunjun
|
1ff7d29c99
|
sprint_204_57094
|
2022-06-15 03:07:20 +00:00 |
|
|
sunjun
|
b4c2ecbb2f
|
sprint_204_57094
|
2022-06-15 03:02:18 +00:00 |
|
|
王怡栋
|
043aed24ec
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task #57089, #57099.
See merge request easycorp/zentaopms!3927
|
2022-06-15 02:21:35 +00:00 |
|
|
sunjun
|
a99aed925f
|
sprint_204_57094
|
2022-06-15 01:42:06 +00:00 |
|
|
孙广明
|
423bd7b9b9
|
Merge branch 'sprint/203_mayue_bug#23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3924
|
2022-06-15 01:08:50 +00:00 |
|
|
mayue
|
8099c563c3
|
* Fix bug #23586.
|
2022-06-15 08:50:16 +08:00 |
|
|
李玉春
|
481b40a16b
|
Merge branch 'cyy_23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3879
|
2022-06-15 00:45:00 +00:00 |
|
|
caoyanyi
|
c1876a6dbc
|
* Modify page locate.
|
2022-06-15 08:44:13 +08:00 |
|
|
caoyanyi
|
8c5d59f15d
|
* Fix bug #23633.
|
2022-06-15 08:41:06 +08:00 |
|
|
xieqiyu
|
cb06e1cd4d
|
* Conflict resolution.
|
2022-06-14 17:55:19 +08:00 |
|
|
zhujinyong
|
87f50aa3be
|
Merge branch 'sprint/sunhao/task56391'
|
2022-06-14 17:12:21 +08:00 |
|
|
孙广明
|
271d1b1a3b
|
Merge branch 'sprint_204_57097' into 'master'
sprint_204_57097
See merge request easycorp/zentaopms!3920
|
2022-06-14 09:09:41 +00:00 |
|
|
sunjun
|
1b2cd0651b
|
sprint_204_57094
|
2022-06-14 09:05:28 +00:00 |
|
|
sunjun
|
d84c0bf80b
|
sprint_204_57094
|
2022-06-14 09:00:35 +00:00 |
|
|
liumengyi
|
ee49b70482
|
* Finish task #57089.
|
2022-06-14 16:42:12 +08:00 |
|