 王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
|
liumengyi
|
8f0073050f
|
* Finish task #58288.
|
2022-06-22 15:23:38 +08:00 |
|
|
李玉春
|
497b32f627
|
Merge branch 'zenops_36' into 'master'
Zenops 36
See merge request easycorp/zentaopms!4066
|
2022-06-22 07:18:41 +00:00 |
|
|
liyuchun
|
4c6ac43ca2
|
* Finish task #57658.
|
2022-06-22 07:16:38 +00:00 |
|
|
mayue
|
c3109321a6
|
* Fix bug #24049;
|
2022-06-22 15:04:28 +08:00 |
|
|
孙广明
|
3b86bcb73d
|
Merge branch 'zg_58291' into 'master'
* Finish task#58291
See merge request easycorp/zentaopms!4062
|
2022-06-22 06:05:39 +00:00 |
|
|
孙广明
|
2b29927fa9
|
Merge branch 'zg_57907' into 'master'
* Code for task #57907
See merge request easycorp/zentaopms!4050
|
2022-06-22 06:05:24 +00:00 |
|
|
孙广明
|
b65967c622
|
Merge branch 'sprint_57888' into 'sprint/206'
*Finish task #57888
See merge request easycorp/zentaopms!4063
|
2022-06-22 06:04:51 +00:00 |
|
|
sunjun
|
2514a53fde
|
fixbug
|
2022-06-22 06:03:07 +00:00 |
|
|
caoyanyi
|
f8d040cc16
|
* Modify mr check.
|
2022-06-22 14:00:56 +08:00 |
|
|
sunjun
|
c883c3b7a3
|
fixbug
|
2022-06-22 05:58:31 +00:00 |
|
|
孙广明
|
491f5051d1
|
Merge branch 'sprint_206_58289' into 'sprint/206'
sprint_206_58259
See merge request easycorp/zentaopms!4061
|
2022-06-22 05:51:17 +00:00 |
|
|
caoyanyi
|
dee75b05f1
|
* Fix bug #23862.
|
2022-06-22 13:49:31 +08:00 |
|
|
sunjun
|
b0fbce7fd4
|
*Finish task #57888
|
2022-06-22 05:48:13 +00:00 |
|
|
leiyong
|
3356617455
|
* Finish task#57878.
|
2022-06-22 05:35:34 +00:00 |
|
|
zenggang
|
ba8f8b2644
|
* Finish task#58291
|
2022-06-22 05:35:32 +00:00 |
|
|
王怡栋
|
68f18a695d
|
Merge branch 'sprint/205_hufangzhou_57883' into 'master'
* Finish task #57883.
See merge request easycorp/zentaopms!4055
|
2022-06-22 05:31:58 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
李玉春
|
2b94fe3a83
|
Merge branch 'cyy_mr' into 'zenops_36'
* Modify repo id save.
See merge request easycorp/zentaopms!4058
|
2022-06-22 05:03:50 +00:00 |
|
|
caoyanyi
|
2d96651ad9
|
* Modify repo id save.
|
2022-06-22 11:57:02 +08:00 |
|
|
wangyidong
|
1e7ec30f10
|
* fix bug for build url in PATH_INFO.
|
2022-06-22 11:45:26 +08:00 |
|
|
孙广明
|
4433b96281
|
Merge branch 'sprint205_leiyong_feishu' into 'sprint/205'
Sprint205 leiyong feishu
See merge request easycorp/zentaopms!4057
|
2022-06-22 03:17:31 +00:00 |
|
|
sunjun
|
138aa7d507
|
sprint_206_58259
|
2022-06-22 03:16:39 +00:00 |
|
|
孙广明
|
1b562972e8
|
Merge branch 'sprint/206' into 'sprint_206_57892'
# Conflicts:
# module/doc/model.php
|
2022-06-22 03:10:18 +00:00 |
|
|
liumengyi
|
38f48bd103
|
* Optimize code for task#57892.
|
2022-06-22 11:08:42 +08:00 |
|
|
tianshujie
|
20de2fde71
|
* Fix bug #23930.
|
2022-06-22 11:04:10 +08:00 |
|
|
liumengyi
|
5ce8133079
|
* Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887.
|
2022-06-22 10:58:57 +08:00 |
|
|
leiyong
|
a5df9de8ad
|
* Finish task#57901.
|
2022-06-22 02:58:47 +00:00 |
|
|
zhouxin
|
4cf1630ae3
|
* Adjust code.
|
2022-06-22 02:55:18 +00:00 |
|
|
zhouxin
|
46cef64035
|
* Add badge.
|
2022-06-22 02:48:36 +00:00 |
|
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
|
王怡栋
|
0e847b9645
|
Merge branch 'sprint/206_liumengyi_58063' into 'sprint/206'
Sprint/206 liumengyi 58063
See merge request easycorp/zentaopms!4053
|
2022-06-22 02:39:17 +00:00 |
|
|
liumengyi
|
2fce450bb8
|
* Fix bug for task #58063.
|
2022-06-22 09:54:08 +08:00 |
|
|
wangyidong
|
c219ffdc7c
|
* adjust for upgrade lite version.
|
2022-06-22 09:53:27 +08:00 |
|
|
孙广明
|
1ebe8d8f06
|
Merge branch 'sprint/207_mayue_bug#23982' into 'master'
* Fix bug #23982.
See merge request easycorp/zentaopms!4049
|
2022-06-22 01:49:36 +00:00 |
|
|
tianshujie
|
3c428752cc
|
* Finish task #57893.
|
2022-06-22 09:45:54 +08:00 |
|
|
hufangzhou
|
49b9f3dffb
|
* Fix bug for the character width.
|
2022-06-22 09:32:07 +08:00 |
|
|
zenggang
|
5bad1b3167
|
* Code for task #57907
|
2022-06-22 01:26:42 +00:00 |
|
|
zhouxin
|
a29205235b
|
* Finish task #57655.
|
2022-06-22 01:23:19 +00:00 |
|
|
mayue
|
0ae4dc0878
|
* Fix bug #23982.
|
2022-06-22 09:19:32 +08:00 |
|
|
liumengyi
|
8c229fa6bc
|
* Finish task #58063.
|
2022-06-22 08:59:29 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
李玉春
|
cbed1964c2
|
Merge branch 'cyy_devops' into 'zenops_36'
* Finish task #57665.
See merge request easycorp/zentaopms!4027
|
2022-06-22 00:35:31 +00:00 |
|
|
caoyanyi
|
7813db6bd3
|
* Adjust codes.
|
2022-06-22 08:34:40 +08:00 |
|
|
孙广明
|
34ddc497ba
|
Merge branch 'zentaopms_207'
|
2022-06-22 08:33:17 +08:00 |
|
|
wangyidong
|
3e4a4668af
|
Merge branch 'zentaomax34'
|
2022-06-22 08:20:28 +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 |
|
|
朱金勇
|
1b8d0637b5
|
Merge branch 'sprint/wangzemei/bug24000' into 'master'
* Fix bug #24000
See merge request easycorp/zentaopms!4041
|
2022-06-22 00:15:48 +00:00 |
|
|
朱金勇
|
3ec3e6d29a
|
Merge branch 'sprint/gfl_fix_bug_#23659' into 'master'
* fix bug #23659
See merge request easycorp/zentaopms!4020
|
2022-06-22 00:15:37 +00:00 |
|
|
leiyong
|
0feed34baa
|
* Finish task#57901.
|
2022-06-21 09:54:50 +00:00 |
|