 王怡栋
|
e00896f727
|
Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417
See merge request easycorp/zentaopms!4237
|
2022-06-30 01:28:55 +00:00 |
|
|
zhouxudong
|
577ba86380
|
* Fix bug #24417.
|
2022-06-30 01:21:54 +00:00 |
|
|
王怡栋
|
2c8c440aa5
|
Merge branch 'master_xieqiyu_23977' into 'master'
* Fix bug#23977.
See merge request easycorp/zentaopms!4238
|
2022-06-30 01:21:52 +00:00 |
|
|
王怡栋
|
b1314bb34e
|
Merge branch 'sprint/209_hufangzhou_xuanPackage' into 'master'
* Change the xuan version.
See merge request easycorp/zentaopms!4239
|
2022-06-30 01:21:11 +00:00 |
|
|
hufangzhou
|
ab1a43e1c6
|
* Change the xuan version.
|
2022-06-30 09:10:00 +08:00 |
|
|
王怡栋
|
7d468d2b3f
|
Merge branch 'spring/master_guofeilong_24480' into 'master'
* fix bug #24480
See merge request easycorp/zentaopms!4236
|
2022-06-30 01:06:12 +00:00 |
|
|
xieqiyu
|
ff682ac683
|
* Fix bug#23977.
|
2022-06-30 09:04:15 +08:00 |
|
|
guofeilong
|
4a93c66679
|
* fix bug #24480
|
2022-06-30 01:00:31 +00:00 |
|
|
zhouxudong
|
298493d3a1
|
* Fix bug #24417.
|
2022-06-30 00:57:18 +00:00 |
|
|
王怡栋
|
c7651d189d
|
Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
* Fix the expiration message displayed on the login page of the new installation environment.
See merge request easycorp/zentaopms!4235
|
2022-06-30 00:56:57 +00:00 |
|
|
王怡栋
|
f29d00bd87
|
Merge branch 'sprint/master_zhouxudong_24480' into 'master'
* Fix bug #24480.
See merge request easycorp/zentaopms!4232
|
2022-06-30 00:56:33 +00:00 |
|
|
王怡栋
|
ffa70aef7d
|
Merge branch 'sprint/master_fixbug_202207' into 'master'
* fix bug #24382
See merge request easycorp/zentaopms!4234
|
2022-06-30 00:56:13 +00:00 |
|
|
tianshujie
|
a9f92875b4
|
* Fix the expiration message displayed on the login page of the new installation environment.
|
2022-06-30 08:55:20 +08:00 |
|
|
lanzongjun
|
66ea6430cf
|
* fix bug #24382
|
2022-06-30 08:52:59 +08:00 |
|
|
zhouxudong
|
fa7b1cf743
|
* Fix bug #24480.
|
2022-06-30 00:14:12 +00:00 |
|
|
王怡栋
|
3f2ff5ad45
|
Merge branch 'fixbug_24544' into 'master'
fixbug_24544
See merge request easycorp/zentaopms!4229
|
2022-06-29 09:19:17 +00:00 |
|
|
zhouxudong
|
a4fc955da5
|
* Fix bug #24480.
|
2022-06-29 09:17:43 +00:00 |
|
|
sunjun
|
dda32cc5ff
|
fixbug_24544
|
2022-06-29 09:16:29 +00:00 |
|
|
王怡栋
|
4fa8895df3
|
Merge branch 'sprint/210_mayue_task#58767' into 'master'
Sprint/210 mayue task#58767
See merge request easycorp/zentaopms!4228
|
2022-06-29 09:12:50 +00:00 |
|
|
mayue
|
7db71208f0
|
* Optimize code.
|
2022-06-29 17:09:07 +08:00 |
|
|
王怡栋
|
f1c9378e10
|
Merge branch 'sprint/devplat_29' into 'master'
* Add fields to integrate workflow and approval.
See merge request easycorp/zentaopms!4224
|
2022-06-29 09:08:21 +00:00 |
|
|
王怡栋
|
6fdf4e481d
|
Merge branch 'sprint/210_mayue_bug#24479' into 'master'
* Fix bug #24479.
See merge request easycorp/zentaopms!4230
|
2022-06-29 09:07:56 +00:00 |
|
|
mayue
|
953d6c8f23
|
* Fix bug #24479.
|
2022-06-29 17:02:00 +08:00 |
|
|
zhouxudong
|
461235a048
|
* Fix bug #24417.
|
2022-06-29 09:00:33 +00:00 |
|
|
sunjun
|
fcda045040
|
fixbug_24544
|
2022-06-29 08:55:08 +00:00 |
|
|
mayue
|
5feb83eef7
|
* Optimize code.
|
2022-06-29 16:54:27 +08:00 |
|
|
mayue
|
02b6efaee0
|
* Optimize code.
|
2022-06-29 16:53:05 +08:00 |
|
|
mayue
|
9802debcad
|
* Optimize code.
|
2022-06-29 16:51:06 +08:00 |
|
|
mayue
|
6289859fb2
|
* Finish task #58767.
|
2022-06-29 16:40:57 +08:00 |
|
|
zhujinyong
|
467b958ba0
|
* If run in container, no need check ok.txt.
|
2022-06-29 16:35:39 +08:00 |
|
|
孙广明
|
8dfd960d52
|
Merge branch 'master_xieqiyu_24395' into 'master'
* Fix bug#24395.
See merge request easycorp/zentaopms!4221
|
2022-06-29 08:33:39 +00:00 |
|
|
孙广明
|
065337842c
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23960.
See merge request easycorp/zentaopms!4223
|
2022-06-29 08:33:28 +00:00 |
|
|
孙广明
|
667c44c591
|
Merge branch 'fixbug_24544' into 'master'
fixbug_24544
See merge request easycorp/zentaopms!4227
|
2022-06-29 08:32:02 +00:00 |
|
|
sunjun
|
815e95eb6c
|
fixbug_24544
|
2022-06-29 08:30:13 +00:00 |
|
|
王怡栋
|
9256ecd32c
|
Merge branch 'master_fixbug' into 'master'
* Fix bug #24552.
See merge request easycorp/zentaopms!4226
|
2022-06-29 08:29:05 +00:00 |
|
|
tanghucheng
|
a4966c759b
|
* Fix bug #24552.
|
2022-06-29 16:27:58 +08:00 |
|
|
王怡栋
|
d674d6a919
|
Merge branch 'sprint/208_tianshujie_24529' into 'master'
* Fix bug #24529.
See merge request easycorp/zentaopms!4225
|
2022-06-29 08:26:07 +00:00 |
|
|
tianshujie
|
49a1cfa087
|
* Fix bug #24529.
|
2022-06-29 16:24:29 +08:00 |
|
|
liugang
|
21ea84f2f5
|
* Add fields to integrate workflow and approval.
|
2022-06-29 16:21:06 +08:00 |
|
|
孙广明
|
50dce20f6f
|
* Code for action error.
|
2022-06-29 16:20:07 +08:00 |
|
|
liyuchun
|
31ca138b18
|
* Fix bug #23960.
|
2022-06-29 08:16:20 +00:00 |
|
|
王怡栋
|
3886d6f502
|
Merge branch 'sprint/208_liumengiy_fixlang' into 'master'
* Fix lang file.
See merge request easycorp/zentaopms!4222
|
2022-06-29 08:07:20 +00:00 |
|
|
liumengyi
|
727211ff46
|
* Fix lang file.
|
2022-06-29 15:49:05 +08:00 |
|
|
wangyidong
|
303b3fb1dd
|
* fix bug #24076.
|
2022-06-29 15:43:41 +08:00 |
|
|
xieqiyu
|
7b579cfa1f
|
* Fix bug#24395.
|
2022-06-29 15:37:04 +08:00 |
|
|
王怡栋
|
fe92dad1c3
|
Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
* Fix bug #24533.
See merge request easycorp/zentaopms!4219
|
2022-06-29 07:30:20 +00:00 |
|
|
王怡栋
|
9a334546a0
|
Merge branch 'master_xieqiyu_24394' into 'master'
* Fix bug#24394.
See merge request easycorp/zentaopms!4214
|
2022-06-29 07:27:43 +00:00 |
|
|
tianshujie
|
32af972947
|
* Fix bug #24533.
|
2022-06-29 15:25:38 +08:00 |
|
|
孙广明
|
e54064bcfe
|
Merge branch 'sprint/master_zhouxudong_projectBug' into 'master'
Sprint/master zhouxudong project bug
See merge request easycorp/zentaopms!4215
|
2022-06-29 07:11:40 +00:00 |
|
|
zhouxudong
|
0a86bc474f
|
* Fix bug #24417.
|
2022-06-29 07:10:13 +00:00 |
|