 tanghucheng
|
19420bef7b
|
* Code for stage.
|
2021-12-03 00:55:54 +08:00 |
|
|
zhujinyong
|
a238baf77c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 15:46:55 +08:00 |
|
|
zhujinyong
|
ddcdaf4319
|
* Fix api of users.
|
2021-12-02 15:46:24 +08:00 |
|
|
王怡栋
|
21a5a2c31a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 15:43:58 +08:00 |
|
|
王怡栋
|
7343f4a2af
|
* fix bug for save query condition.
|
2021-12-02 15:43:36 +08:00 |
|
|
李玉春
|
b26673eb9b
|
Merge branch 'sprint/174_tianshujie_16968' into 'master'
Sprint/174 tianshujie 16968
See merge request easycorp/zentaopms!748
|
2021-12-02 07:42:14 +00:00 |
|
|
李玉春
|
db897d851d
|
Merge branch 'devops_16765' into 'master'
* Fix bug#16765,16771
See merge request easycorp/zentaopms!746
|
2021-12-02 07:41:47 +00:00 |
|
|
liyuchun
|
a71e05051b
|
Merge branch 'sprint/174_mayue_17036'
|
2021-12-02 15:41:16 +08:00 |
|
|
李玉春
|
3e07dd1d72
|
Merge branch 'master' into 'sprint/174_mayue_17036'
# Conflicts:
# module/testtask/model.php
|
2021-12-02 07:41:03 +00:00 |
|
|
tianshujie
|
9e9dcf653d
|
* Modify the code issue.
|
2021-12-02 15:40:45 +08:00 |
|
|
mayue
|
8ba4ebf390
|
* Conflict resolution #17036.
|
2021-12-02 15:40:02 +08:00 |
|
|
李玉春
|
befdfa2eb4
|
Merge branch 'sprint/174_tianshujie_16927' into 'master'
* Fix bug #16927.
See merge request easycorp/zentaopms!730
|
2021-12-02 07:39:36 +00:00 |
|
|
mayue
|
f6676e2757
|
* Conflict resolution #17036.
|
2021-12-02 15:36:31 +08:00 |
|
|
tianshujie
|
ac0cd01df6
|
* Fix bug #17043.
|
2021-12-02 15:35:35 +08:00 |
|
|
李玉春
|
3955798100
|
Merge branch 'devops_17024' into 'master'
* Fix bug#17027,17024,16884
See merge request easycorp/zentaopms!741
|
2021-12-02 07:35:33 +00:00 |
|
|
孙广明
|
3aa9a7d37f
|
Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug
See merge request easycorp/zentaopms!742
|
2021-12-02 07:34:42 +00:00 |
|
|
liyuchun
|
da73e10709
|
* Fix bug #16856.
|
2021-12-02 15:32:27 +08:00 |
|
|
mayue
|
8c355ac388
|
* Modify style #17036.
|
2021-12-02 15:30:23 +08:00 |
|
|
tianshujie
|
4a62ededb0
|
* Fix bug #16968.
|
2021-12-02 15:27:17 +08:00 |
|
|
tianshujie
|
895db10fc4
|
* Delete redundant judgments.
|
2021-12-02 15:23:45 +08:00 |
|
|
李玉春
|
0c44013922
|
Merge branch 'sprint/174_songchenxuan_codefortestbug' into 'master'
*Fix bug for test bug.
See merge request easycorp/zentaopms!744
|
2021-12-02 07:22:51 +00:00 |
|
|
zenggang
|
a48f584ca8
|
* Fix bug#16765,16771
|
2021-12-02 07:14:31 +00:00 |
|
|
孙广明
|
a6bf945fab
|
Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!745
|
2021-12-02 07:12:10 +00:00 |
|
|
hufangzhou
|
0ea3436bc1
|
* Remove the unused code.
|
2021-12-02 15:11:05 +08:00 |
|
|
李玉春
|
f2a7e5e302
|
Merge branch 'sprint/174_tianshujie_16785' into 'master'
* Fix bug #17006,16785.
See merge request easycorp/zentaopms!728
|
2021-12-02 07:09:05 +00:00 |
|
|
李玉春
|
1223ec4a2f
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
Sprint/175 sgm fixbug
See merge request easycorp/zentaopms!737
|
2021-12-02 07:06:54 +00:00 |
|
|
songchenxuan
|
2e0f5badc1
|
*Fix bug for test bug.
|
2021-12-02 14:57:37 +08:00 |
|
|
liyuchun
|
c943151157
|
* Fix bug #16847.
|
2021-12-02 14:28:50 +08:00 |
|
|
zenggang
|
0cf9288308
|
* Fix bug#17027,17024,16884
|
2021-12-02 06:26:33 +00:00 |
|
|
liyuchun
|
2899947808
|
* Fix bug #16725.
|
2021-12-02 14:18:13 +08:00 |
|
|
孙广明
|
1c86d07967
|
Merge branch 'sprint/devops_liyuchun_bug' into 'master'
Sprint/devops liyuchun bug
See merge request easycorp/zentaopms!738
|
2021-12-02 06:16:37 +00:00 |
|
|
liyuchun
|
696892f246
|
* Fix bug #16716.
|
2021-12-02 14:14:29 +08:00 |
|
|
liyuchun
|
b75c77b3e7
|
* Fix bug #17000.
|
2021-12-02 14:07:06 +08:00 |
|
|
liyuchun
|
79fa40bef2
|
* Reduction code.
|
2021-12-02 13:55:47 +08:00 |
|
|
孙广明
|
54c761da36
|
Merge branch 'sprint/devops_liyuchun_16893' into 'master'
* Fix gitlab error.
See merge request easycorp/zentaopms!731
|
2021-12-02 05:55:15 +00:00 |
|
|
liyuchun
|
6caf5097ec
|
* Fix error of gitlab.
|
2021-12-02 13:54:06 +08:00 |
|
|
孙广明
|
9ddee1bcea
|
* Fix bug #17008.
|
2021-12-02 13:53:56 +08:00 |
|
|
tianshujie
|
7356cbc76e
|
* Optimize code logic.
|
2021-12-02 13:23:30 +08:00 |
|
|
liyuchun
|
0e30ba0a3b
|
* Fix bug #16836.
|
2021-12-02 13:19:50 +08:00 |
|
|
孙广明
|
1faf545954
|
* Remove unused code.
|
2021-12-02 13:10:55 +08:00 |
|
|
李玉春
|
7bcbab370a
|
Merge branch 'sprint/174_songchenxuan_16872' into 'master'
* Fix bug #16872.
See merge request easycorp/zentaopms!735
|
2021-12-02 05:08:27 +00:00 |
|
|
李玉春
|
22aff07db9
|
Merge branch 'sprint/174_songchenxuan_addcomment' into 'master'
* Add testcase batchEdit comment.
See merge request easycorp/zentaopms!720
|
2021-12-02 05:08:14 +00:00 |
|
|
songchenxuan
|
febde653ad
|
* Fix bug #16872.
|
2021-12-02 13:06:03 +08:00 |
|
|
李玉春
|
ee0bdfb1a2
|
Merge branch 'devops_16736' into 'master'
* Fix bug#16846
See merge request easycorp/zentaopms!732
|
2021-12-02 05:05:04 +00:00 |
|
|
liyuchun
|
fa2041169e
|
Merge branch 'sprint/175_sgm_fixbug'
|
2021-12-02 12:03:39 +08:00 |
|
|
李玉春
|
38f5ab4145
|
Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
# module/execution/control.php
# module/message/config.php
|
2021-12-02 05:04:29 +00:00 |
|
|
tianshujie
|
565ef0adbb
|
* Fix bug #16927.
|
2021-12-02 11:27:24 +08:00 |
|
|
孙广明
|
575d9e098f
|
Merge branch 'sprint/175_zry_fixbug' into 'master'
Sprint/175 zry fixbug
See merge request easycorp/zentaopms!733
|
2021-12-02 03:22:23 +00:00 |
|
|
李玉春
|
199577f068
|
Merge branch 'sprint/29_zhouxin_16905' into 'master'
Fix bug #16905.
See merge request easycorp/zentaopms!709
|
2021-12-02 03:19:57 +00:00 |
|
|
zhengrunyu
|
bd075ac17d
|
*Fixbug #16978.
|
2021-12-02 11:18:53 +08:00 |
|