 tianshujie
|
08e8bfea06
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2022-11-15 17:07:27 +08:00 |
|
|
tianshujie
|
614a518edd
|
* Add search functon for program list.
|
2022-11-15 17:07:06 +08:00 |
|
|
王怡栋
|
6fc2d1bd23
|
Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.
See merge request easycorp/zentaopms!6160
|
2022-11-15 08:31:10 +00:00 |
|
|
王怡栋
|
591a79487b
|
Merge branch 'zentaopms_261_kanban_import_release' into 'master'
* Adjust import release list.
See merge request easycorp/zentaopms!6166
|
2022-11-15 08:30:49 +00:00 |
|
|
王怡栋
|
35013a4844
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-11-15 16:27:34 +08:00 |
|
|
王怡栋
|
ab5e0d9b4a
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/execution/control.php
|
2022-11-15 08:26:48 +00:00 |
|
|
daitingting
|
cc12e45755
|
g * Adjust import release list.
|
2022-11-15 08:26:43 +00:00 |
|
|
liuhong
|
13c945cd07
|
* Adjust code feedback #1422.
|
2022-11-15 08:26:11 +00:00 |
|
|
王怡栋
|
6e844601d1
|
Merge branch 'zentaopms_261_bug_#29623' into 'master'
* Fix bug #29623.
See merge request easycorp/zentaopms!6162
|
2022-11-15 08:22:28 +00:00 |
|
|
王怡栋
|
1890c90011
|
Merge branch 'zentaopms_258_bug#29694' into 'master'
* Fix bug #29694.
See merge request easycorp/zentaopms!6161
|
2022-11-15 08:18:56 +00:00 |
|
|
王怡栋
|
a3329783e3
|
Merge branch 'zentaopms_258_bug#29735' into 'master'
* Fix bug #29735.
See merge request easycorp/zentaopms!6158
|
2022-11-15 08:15:50 +00:00 |
|
|
王怡栋
|
bcf50feeaa
|
Merge branch 'zentaopms_258_bug#29759' into 'master'
* Fix bug #29759.
See merge request easycorp/zentaopms!6156
|
2022-11-15 08:15:27 +00:00 |
|
|
孙广明
|
093069f5eb
|
Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.
See merge request easycorp/zentaopms!6148
|
2022-11-15 08:13:37 +00:00 |
|
|
孙广明
|
9fff01e2bf
|
Merge branch 'master_xieqiyu_75907' into 'master'
* Fix bug#29445.
See merge request easycorp/zentaopms!6146
|
2022-11-15 08:13:11 +00:00 |
|
|
孙广明
|
3aedd173f8
|
Merge branch 'master_xieqiyu_29808' into 'master'
* Fix bug#29808.
See merge request easycorp/zentaopms!6165
|
2022-11-15 07:57:42 +00:00 |
|
|
xieqiyu
|
85c8e84c79
|
* Fix bug#29808.
|
2022-11-15 15:56:34 +08:00 |
|
|
孙广明
|
d18d4c8a44
|
Merge branch 'sprint/zentaopms262_mayue_bug#29682' into 'master'
* Fix bug #29682.
See merge request easycorp/zentaopms!6157
|
2022-11-15 07:55:33 +00:00 |
|
|
孙广明
|
d9a22dd22f
|
Merge branch 'sprint/zentaopms262_mayue_bug#29757' into 'master'
* Fix bug #29757.
See merge request easycorp/zentaopms!6152
|
2022-11-15 07:54:50 +00:00 |
|
|
孙广明
|
b7d1be8bc6
|
Merge branch 'sprint/zentaopms262_mayue_bug#29725' into 'master'
* Fix bug #29725.
See merge request easycorp/zentaopms!6164
|
2022-11-15 07:54:18 +00:00 |
|
|
孙广明
|
63db685dc5
|
Merge branch 'sprint/zentaopms262_mayue_bug#29741' into 'master'
* Fix bug #29741.
See merge request easycorp/zentaopms!6149
|
2022-11-15 07:53:43 +00:00 |
|
|
lanzongjun
|
df7841c7b7
|
* finish task #75920
|
2022-11-15 15:50:05 +08:00 |
|
|
王怡栋
|
60f27fc682
|
Merge branch 'master_xieqiyu_75905' into 'master'
* Fix bug#29449.
See merge request easycorp/zentaopms!6145
|
2022-11-15 07:38:34 +00:00 |
|
|
lanzongjun
|
0e6c9a88d3
|
* finish task #76330
|
2022-11-15 15:23:49 +08:00 |
|
|
mayue
|
cd7a5fd390
|
* Fix bug #29725.
|
2022-11-15 15:12:15 +08:00 |
|
|
lanzongjun
|
69bd73c271
|
* finish task #76338
|
2022-11-15 15:04:22 +08:00 |
|
|
王怡栋
|
f950d1fa82
|
* fix bug #76334.
|
2022-11-15 15:03:32 +08:00 |
|
|
daitingting
|
37caf86461
|
* Fix bug #29665.
|
2022-11-15 06:58:54 +00:00 |
|
|
daitingting
|
8e872c71e3
|
* Fix bug #29623.
|
2022-11-15 06:49:19 +00:00 |
|
|
王怡栋
|
e8e0fad622
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #76334
See merge request easycorp/zentaopms!6159
|
2022-11-15 06:32:25 +00:00 |
|
|
lanzongjun
|
c155808a69
|
fix code error
|
2022-11-15 14:29:27 +08:00 |
|
|
王怡栋
|
c9f2e7c27f
|
* fix bug #29674.
|
2022-11-15 14:25:56 +08:00 |
|
|
lanzongjun
|
4849895b69
|
* finish task #76334
|
2022-11-15 14:18:36 +08:00 |
|
|
wangyuting
|
dfdcc78206
|
* Optimize code.
|
2022-11-15 06:17:36 +00:00 |
|
|
wangyuting
|
dcd256203a
|
* Fix bug #29735.
|
2022-11-15 06:15:10 +00:00 |
|
|
mayue
|
146559bc2d
|
* Fix bug #29682.
|
2022-11-15 13:57:03 +08:00 |
|
|
王怡栋
|
4352117e4d
|
* fix bug #29699.
|
2022-11-15 13:56:40 +08:00 |
|
|
xieqiyu
|
8bc640bd29
|
* Fix bug#29752.
|
2022-11-15 13:50:31 +08:00 |
|
|
wangyuting
|
0afdea4382
|
* Fix bug #29759.
|
2022-11-15 05:50:07 +00:00 |
|
|
王怡栋
|
8d4a12b869
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-15 13:47:55 +08:00 |
|
|
王怡栋
|
231e210373
|
* code for task #29718.
|
2022-11-15 13:47:37 +08:00 |
|
|
王怡栋
|
4a18ef985d
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75912#75908#75904#75919#75923#75924#76338
See merge request easycorp/zentaopms!6142
|
2022-11-15 05:39:37 +00:00 |
|
|
lanzongjun
|
72c38e942e
|
add param
|
2022-11-15 13:39:09 +08:00 |
|
|
王怡栋
|
575854c7dd
|
Merge branch 'fixbug' into 'master'
* Fix bug #29749.
See merge request easycorp/zentaopms!6153
|
2022-11-15 05:31:35 +00:00 |
|
|
王怡栋
|
019a41668b
|
Merge branch 'zentaopms_261_bug_#29621' into 'master'
* Fix bug #29621.
See merge request easycorp/zentaopms!6155
|
2022-11-15 05:26:03 +00:00 |
|
|
王怡栋
|
b7484cbcb1
|
Merge branch 'zentaopms_258_bug#29700' into 'master'
* Fix bug #29700.
See merge request easycorp/zentaopms!6154
|
2022-11-15 05:24:39 +00:00 |
|
|
wangyuting
|
aed6871cd8
|
* Fix bug #29694.
|
2022-11-15 05:20:46 +00:00 |
|
|
daitingting
|
7693217115
|
* Fix bug #29621.
|
2022-11-15 05:20:17 +00:00 |
|
|
王怡栋
|
c3d25c98d2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-15 13:19:36 +08:00 |
|
|
王怡栋
|
bd06ac3570
|
* fix bug #29723.
|
2022-11-15 13:19:06 +08:00 |
|
|
wangyuting
|
11343aa6cc
|
* Fix bug #29700.
|
2022-11-15 05:15:35 +00:00 |
|