 孙广明
|
352cb8adf2
|
Merge branch 'zg_23246' into 'master'
* Fix bug#23246
See merge request easycorp/zentaopms!3738
|
2022-06-06 05:04:26 +00:00 |
|
|
zenggang
|
c69ffb8d7d
|
* Fix bug#23246
|
2022-06-06 04:30:37 +00:00 |
|
|
王怡栋
|
913ea1b898
|
Merge branch 'master_fixbug' into 'master'
* Fix bug #23267.
See merge request easycorp/zentaopms!3736
|
2022-06-06 03:18:04 +00:00 |
|
|
tanghucheng
|
2200dadea6
|
* Fix bug #23267.
|
2022-06-06 11:16:08 +08:00 |
|
|
李玉春
|
4709cb6e9f
|
Merge branch 'sprint/scx_zaction' into 'master'
Sprint/scx zaction
See merge request easycorp/zentaopms!3734
|
2022-06-06 02:14:14 +00:00 |
|
|
李玉春
|
6fe727b009
|
Update model.php
|
2022-06-06 02:13:20 +00:00 |
|
|
宋辰轩
|
cfb0d45d7a
|
Merge branch 'sprint/scx_zaction' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/scx_zaction
|
2022-06-06 10:10:00 +08:00 |
|
|
宋辰轩
|
8f4cc42550
|
* Modify function return.
|
2022-06-06 10:09:48 +08:00 |
|
|
李玉春
|
49c1f2161c
|
Update ztcli
|
2022-06-06 02:09:19 +00:00 |
|
|
caoyanyi
|
7dfa16f3b5
|
* Modify cli params.
|
2022-06-06 09:57:10 +08:00 |
|
|
孙广明
|
5468fe8ee5
|
Merge branch 'master_xieqiyu_23242' into 'master'
* Fix bug#23242.
See merge request easycorp/zentaopms!3733
|
2022-06-06 01:53:54 +00:00 |
|
|
zhujinyong
|
7f95ea2c09
|
* Check unique for api doc.
|
2022-06-06 09:24:44 +08:00 |
|
|
zhujinyong
|
9f322ef866
|
* Renew apis.
|
2022-06-06 08:53:54 +08:00 |
|
|
宋辰轩
|
6af617ec3b
|
Merge branch 'master' into sprint/scx_zaction
|
2022-06-06 08:30:30 +08:00 |
|
|
xieqiyu
|
e69afb987b
|
* Fix bug#23242.
|
2022-06-05 20:13:05 +08:00 |
|
|
朱金勇
|
b4936703f1
|
Merge branch 'master_xieqiyu_23159' into 'master'
* Fix bug#23159.
See merge request easycorp/zentaopms!3732
|
2022-06-02 10:17:21 +00:00 |
|
|
孙广明
|
82f09dcb51
|
Merge branch 'master_xieqiyu_23154' into 'master'
* Fix bug#23154.
See merge request easycorp/zentaopms!3731
|
2022-06-02 09:43:11 +00:00 |
|
|
孙广明
|
f14516b7b1
|
Merge branch 'sprint/liumengyi_fixbug' into 'master'
* Fix bug #23236.
See merge request easycorp/zentaopms!3730
|
2022-06-02 09:10:49 +00:00 |
|
|
liumengyi
|
356d69025a
|
* Fix bug #23236.
|
2022-06-02 17:08:00 +08:00 |
|
|
孙广明
|
0a68d0b6fb
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23230.
See merge request easycorp/zentaopms!3728
|
2022-06-02 08:37:04 +00:00 |
|
|
tianshujie
|
10b763fdf2
|
* Fix bug #23230.
|
2022-06-02 16:35:48 +08:00 |
|
|
王怡栋
|
a5deb20879
|
Merge branch 'sgm_license' into 'master'
* Change zentao license.
See merge request easycorp/zentaopms!3727
|
2022-06-02 08:35:35 +00:00 |
|
|
孙广明
|
6446a75af5
|
* Change zentao license.
|
2022-06-02 16:32:59 +08:00 |
|
|
孙广明
|
c6c1ce36a4
|
Merge branch 'autotest_ly' into 'master'
update data by table project
See merge request easycorp/zentaopms!3724
|
2022-06-02 08:05:12 +00:00 |
|
|
孙广明
|
1dd0b6c022
|
Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.
See merge request easycorp/zentaopms!3725
|
2022-06-02 08:04:56 +00:00 |
|
|
孙广明
|
9dd7d94787
|
Merge branch 'sprint/197_liumengyi_23213' into 'master'
* Fix bug #23213.
See merge request easycorp/zentaopms!3726
|
2022-06-02 08:04:42 +00:00 |
|
|
liumengyi
|
7a14f8a946
|
* Fix bug #23213.
|
2022-06-02 16:03:40 +08:00 |
|
|
tianshujie
|
653e681ed2
|
* Fix bug #23213.
|
2022-06-02 16:02:19 +08:00 |
|
|
liumengyi
|
4d2c34c122
|
* Fix bug #23213.
|
2022-06-02 15:59:57 +08:00 |
|
|
李玉春
|
bd8ecb4f1c
|
Merge branch 'sprint/196_leiyong_fix_bug' into 'master'
* Fix bug#23204.
See merge request easycorp/zentaopms!3719
|
2022-06-02 07:55:36 +00:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
孙广明
|
cf5dbf0f23
|
* Remove unused code.
|
2022-06-02 14:53:51 +08:00 |
|
|
孙广明
|
23d19bd6b3
|
* Code for export users.
|
2022-06-02 14:52:16 +08:00 |
|
|
liyang
|
7db24312ea
|
update data by table project
|
2022-06-02 14:34:43 +08:00 |
|
|
李玉春
|
66ca553dad
|
Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265
See merge request easycorp/zentaopms!3722
|
2022-06-02 06:32:26 +00:00 |
|
|
zhouxudong
|
3e4db334a5
|
* Fix bug #19265.
|
2022-06-02 06:24:53 +00:00 |
|
|
孙广明
|
716c7ca6e6
|
Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182
See merge request easycorp/zentaopms!3703
|
2022-06-02 06:17:56 +00:00 |
|
|
孙广明
|
38b9119de9
|
Merge branch 'fixbug_sunjun_22971' into 'master'
fixbug_sunjun_22971
See merge request easycorp/zentaopms!3721
|
2022-06-02 06:17:36 +00:00 |
|
|
孙广明
|
9fe2c296a5
|
Merge branch 'sprint/198_mayue_task#55852' into 'master'
* Finish task #55852.
See merge request easycorp/zentaopms!3716
|
2022-06-02 06:16:12 +00:00 |
|
|
孙广明
|
b99385ee25
|
Merge branch 'fixbug_sunjun_22959' into 'master'
fixbug_sunjun_22959
See merge request easycorp/zentaopms!3717
|
2022-06-02 06:15:41 +00:00 |
|
|
孙广明
|
df1c3d0556
|
Merge branch 'liyuchun_fixbug' into 'master'
* Finish task #55841.
See merge request easycorp/zentaopms!3718
|
2022-06-02 06:15:25 +00:00 |
|
|
孙广明
|
c6b95bd7b7
|
Merge branch 'sprint/liumengyi_fixbug' into 'master'
* Fix bug #23031.
See merge request easycorp/zentaopms!3720
|
2022-06-02 06:15:06 +00:00 |
|
|
sunjun
|
136d48f85e
|
fixbug_sunjun_22971
|
2022-06-02 06:14:57 +00:00 |
|
|
leiyong
|
5539a1ec17
|
* Adjust code.
|
2022-06-02 06:13:04 +00:00 |
|
|
liumengyi
|
4e71cb29a8
|
* Fix bug #23031.
|
2022-06-02 14:12:00 +08:00 |
|
|
leiyong
|
70db40b821
|
* Fix bug#23204.
|
2022-06-02 06:10:46 +00:00 |
|
|
liyuchun
|
620aa77d04
|
* Finish task #55841.
|
2022-06-02 06:02:58 +00:00 |
|
|
孙广明
|
ea678a3736
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.
See merge request easycorp/zentaopms!3710
|
2022-06-02 05:55:29 +00:00 |
|
|
sunjun
|
d3c0e96b98
|
fixbug_sunjun_22959
|
2022-06-02 05:40:49 +00:00 |
|
|
孙广明
|
846992386c
|
Merge branch 'sprint/198_zg_55851' into 'zentaopms_198'
* Code for task#55851
See merge request easycorp/zentaopms!3715
|
2022-06-02 05:35:29 +00:00 |
|