李玉春
|
e19ca18d37
|
Merge branch 'devops20_18969' into 'master'
修复bug 18969
See merge request easycorp/zentaopms!1613
|
2022-01-25 09:15:37 +00:00 |
|
liyuchun
|
555fbaddef
|
Merge branch 'devops20'
|
2022-01-25 16:55:51 +08:00 |
|
zenggang
|
7c2443dc66
|
* Fix bug#18969
|
2022-01-25 08:53:55 +00:00 |
|
zenggang
|
5f83afb622
|
* Unit test and adjust code
|
2022-01-25 08:33:21 +00:00 |
|
zenggang
|
5183b24bd0
|
* Adjust code
|
2022-01-25 02:37:51 +00:00 |
|
zenggang
|
216be433d4
|
* Adjust code
|
2022-01-25 01:28:07 +00:00 |
|
zenggang
|
4ab46cb2ea
|
*Finish task#48107,48106,48105,48103 and adjust code
|
2022-01-25 01:13:49 +00:00 |
|
孙广明
|
461940c671
|
Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48096.
See merge request easycorp/zentaopms!1567
|
2022-01-24 09:23:16 +00:00 |
|
liyuchun
|
eba799b60f
|
* Fix bug #18492.
|
2022-01-24 17:20:19 +08:00 |
|
caoyanyi
|
c077f9ff4d
|
* Modify auth check.
|
2022-01-24 08:20:40 +00:00 |
|
caoyanyi
|
a2a1df2b9e
|
* Modify isset check.
|
2022-01-24 08:08:24 +00:00 |
|
caoyanyi
|
d0b289ed21
|
* Finish task #48108.
|
2022-01-24 07:46:22 +00:00 |
|
zenggang
|
47e13757a8
|
* Adjust code
|
2022-01-21 05:11:52 +00:00 |
|
zenggang
|
e315a62440
|
* Adjust code
|
2022-01-21 02:38:51 +00:00 |
|
zenggang
|
36c97752b4
|
* Finish task#48104
|
2022-01-20 09:25:44 +00:00 |
|
李玉春
|
39e8a3fae7
|
Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
|
2022-01-20 05:42:05 +00:00 |
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
zenggang
|
4b0d2e842a
|
* Fix bug#18456,18393,18392
|
2022-01-17 06:49:36 +00:00 |
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
|
2022-01-10 00:46:09 +00:00 |
|
liyuchun
|
ab097f3a61
|
* Fix bug #18264.
|
2022-01-10 08:39:41 +08:00 |
|
zenggang
|
a87d365a09
|
* Fix bug#18277
|
2022-01-07 03:03:44 +00:00 |
|
李玉春
|
c357477762
|
Merge branch 'devops18_47047' into 'master'
* Finish task#47047
See merge request easycorp/zentaopms!1272
|
2022-01-06 03:00:38 +00:00 |
|
李玉春
|
4ca46cc91f
|
Merge branch 'devops18_47057' into 'master'
* Finish task#47057
See merge request easycorp/zentaopms!1260
|
2022-01-06 02:59:30 +00:00 |
|
zenggang
|
08132a448d
|
* Adjust code
|
2022-01-05 06:39:32 +00:00 |
|
zenggang
|
79859569b3
|
* Finish task#47047
|
2022-01-05 06:24:19 +00:00 |
|
zenggang
|
443a00c606
|
* Finish task#47057
|
2022-01-05 02:16:33 +00:00 |
|
caoyanyi
|
5d9dc4885b
|
* Finish task #47051.
|
2022-01-05 02:03:30 +00:00 |
|
liyuchun
|
2c5d8abc45
|
* Fix bug #18150.
|
2022-01-04 16:15:17 +08:00 |
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
王怡栋
|
05bb5b46b8
|
* fix bug #18111.
|
2021-12-31 10:31:58 +08:00 |
|
王怡栋
|
f895777dec
|
* adjust for z tool.
|
2021-12-31 09:54:58 +08:00 |
|
王怡栋
|
2f86ca39d8
|
Merge branch 'devops18_liyuchun' into 'devops18'
Fix bug #18078.
See merge request easycorp/zentaopms!1211
|
2021-12-30 08:15:53 +00:00 |
|
liyuchun
|
55c7c7e848
|
* Fix bug #18078.
|
2021-12-30 16:13:40 +08:00 |
|
liyuchun
|
b45ec10f40
|
* Fix bug #18078.
|
2021-12-30 15:36:33 +08:00 |
|
李玉春
|
26621179fd
|
Merge branch 'devops18_wangyidong_46553' into 'devops18'
* fix error.
See merge request easycorp/zentaopms!1206
|
2021-12-30 07:30:53 +00:00 |
|
王怡栋
|
0552eec334
|
* fix error.
|
2021-12-30 15:19:59 +08:00 |
|
李玉春
|
07756750db
|
Merge branch 'devops18_46555' into 'devops18'
* Finish task#46555
See merge request easycorp/zentaopms!1189
|
2021-12-30 05:33:10 +00:00 |
|
zenggang
|
bfde525f13
|
* Finish task#46555
|
2021-12-30 03:08:42 +00:00 |
|
王怡栋
|
7c5be1093e
|
* adjust code task #46553.
|
2021-12-30 10:38:01 +08:00 |
|
王怡栋
|
134cd55f46
|
* adjust for task #46553.
|
2021-12-30 10:31:19 +08:00 |
|
王怡栋
|
061bf4388c
|
* adjust for unit test.
|
2021-12-30 10:08:00 +08:00 |
|
王怡栋
|
625a6a47c4
|
* code for task #46553.
|
2021-12-30 08:38:54 +08:00 |
|
王怡栋
|
c1ffbd839a
|
Merge branch 'sprint/liyuchun_devops' into 'master'
Sprint/liyuchun devops
See merge request easycorp/zentaopms!1137
|
2021-12-29 08:04:37 +00:00 |
|
李玉春
|
7d8aa9da78
|
Merge branch 'devops18_46549' into 'devops18'
* Finish task#46549
See merge request easycorp/zentaopms!1175
|
2021-12-29 03:19:45 +00:00 |
|
liyuchun
|
b9c8bd4afd
|
* Fix error when change source project.
|
2021-12-29 10:45:05 +08:00 |
|
zenggang
|
8e4cfa8744
|
* Finish task#46549
|
2021-12-29 02:29:19 +00:00 |
|
王怡栋
|
3a6e39f834
|
Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Finish task #46551.
See merge request easycorp/zentaopms!1174
|
2021-12-29 02:25:31 +00:00 |
|
liyuchun
|
8e98e9831e
|
* Finish task #46551.
|
2021-12-29 10:02:25 +08:00 |
|