 王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
tianshujie
|
16a8bcf5f6
|
* Finish task #58557.
|
2022-07-06 14:40:42 +08:00 |
|
|
王怡栋
|
1653df17fd
|
Merge branch 'sprint/master_zhouxudong_24736' into 'master'
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
See merge request easycorp/zentaopms!4375
|
2022-07-06 06:24:30 +00:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
王怡栋
|
bb859c6261
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24843.
See merge request easycorp/zentaopms!4373
|
2022-07-06 06:08:40 +00:00 |
|
|
孙广明
|
69ec58a361
|
Merge branch 'sprint_59471' into 'master'
Sprint 59471
See merge request easycorp/zentaopms!4370
|
2022-07-06 05:46:33 +00:00 |
|
|
liumengyi
|
ead37d6de6
|
* Fix bug #24843.
|
2022-07-06 13:43:51 +08:00 |
|
|
sunjun
|
654ae6fe91
|
sprint_59471
|
2022-07-06 04:23:38 +00:00 |
|
|
王怡栋
|
cea57edc73
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Fix bug of task #59477.
See merge request easycorp/zentaopms!4367
|
2022-07-06 02:17:51 +00:00 |
|
|
王怡栋
|
29bed0101b
|
Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525
See merge request easycorp/zentaopms!4365
|
2022-07-06 02:17:24 +00:00 |
|
|
zhouxudong
|
bf19599c0e
|
* Finish task #59525.
|
2022-07-06 02:15:33 +00:00 |
|
|
liumengyi
|
625d04ff6f
|
* Fix bug of task #59477.
|
2022-07-06 09:51:14 +08:00 |
|
|
王怡栋
|
c7b10921f4
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Finish task #59477.
See merge request easycorp/zentaopms!4364
|
2022-07-06 01:50:59 +00:00 |
|
|
liumengyi
|
45183de128
|
* Add annotation.
|
2022-07-06 09:49:20 +08:00 |
|
|
zhouxudong
|
85f7dd9c95
|
* Finish task #59525.
|
2022-07-06 01:29:25 +00:00 |
|
|
liumengyi
|
500302a590
|
* Fix bug of task #59477.
|
2022-07-06 09:28:10 +08:00 |
|
|
liumengyi
|
4324454636
|
* Fix bug of task #59477.
|
2022-07-06 08:52:27 +08:00 |
|
|
tianshujie
|
577b42f32c
|
* Hide required fields in custom forms.
|
2022-07-06 08:41:20 +08:00 |
|
|
zhouxudong
|
ddecdf5cb8
|
* Finish task #59525.
|
2022-07-06 00:31:05 +00:00 |
|
|
tianshujie
|
cdaf164f0a
|
* Fix bug #24752,24747.
|
2022-07-06 08:26:27 +08:00 |
|
|
liumengyi
|
7bb148a48b
|
* Fix bug of task #59477.
|
2022-07-05 22:17:19 +08:00 |
|
|
tianshujie
|
aa1079feaf
|
* Finish task #58557.
|
2022-07-05 15:30:58 +08:00 |
|
|
liumengyi
|
c82f3f1886
|
* Finish task #59477.
|
2022-07-05 14:36:16 +08:00 |
|
|
liumengyi
|
57c87e5912
|
* Finish task #59477.
|
2022-07-05 13:52:57 +08:00 |
|
|
王怡栋
|
71ab49c34e
|
Merge branch 'sprint/master_zhouxudong_59529' into 'master'
* Finish task #59534 #59530 #59529.
See merge request easycorp/zentaopms!4325
|
2022-07-05 02:09:08 +00:00 |
|
|
liumengyi
|
d1f25755f1
|
* Finish task #59477.
|
2022-07-05 09:39:55 +08:00 |
|
|
zhouxudong
|
0b309f63bd
|
* Finish task #59534 #59530 #59529.
|
2022-07-04 08:54:44 +00:00 |
|
|
liumengyi
|
79e71873c5
|
* Finish task #59477.
|
2022-07-04 15:50:03 +08:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
孙广明
|
cb767b9334
|
Merge branch 'fixbug_23768' into 'master'
Fixbug 23768
See merge request easycorp/zentaopms!4292
|
2022-07-01 00:54:35 +00:00 |
|
|
sunjun
|
04d64fa539
|
fixbug_23768
|
2022-07-01 00:27:49 +00:00 |
|
|
sunjun
|
183b1a716b
|
fixbug_23768
|
2022-06-30 09:26:19 +00:00 |
|
|
liumengyi
|
d65ba3736d
|
* Fix bug #24609.
|
2022-06-30 16:44:36 +08:00 |
|
|
王怡栋
|
3f2ff5ad45
|
Merge branch 'fixbug_24544' into 'master'
fixbug_24544
See merge request easycorp/zentaopms!4229
|
2022-06-29 09:19:17 +00:00 |
|
|
sunjun
|
dda32cc5ff
|
fixbug_24544
|
2022-06-29 09:16:29 +00:00 |
|
|
sunjun
|
fcda045040
|
fixbug_24544
|
2022-06-29 08:55:08 +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 |
|
|
tianshujie
|
49a1cfa087
|
* Fix bug #24529.
|
2022-06-29 16:24:29 +08:00 |
|
|
liumengyi
|
30e6558572
|
* Fix bug #24487.
|
2022-06-29 14:07:47 +08:00 |
|
|
liumengyi
|
a6d87c2539
|
* Fix bug #24500.
|
2022-06-29 08:13:59 +08:00 |
|
|
liumengyi
|
c61cc238c0
|
* Fix bug #24475.
|
2022-06-28 16:16:51 +08:00 |
|
|
liumengyi
|
38ff5fd283
|
* Fix bug #24464.
|
2022-06-28 15:20:31 +08:00 |
|
|
liumengyi
|
cd3956ad1c
|
* Optimize code.
|
2022-06-28 13:06:38 +08:00 |
|
|
liumengyi
|
ca6332efaa
|
* Optimize code.
|
2022-06-28 13:04:44 +08:00 |
|
|
liumengyi
|
d08f95c0fa
|
* Optimize code.
|
2022-06-28 12:24:21 +08:00 |
|
|
liumengyi
|
16d62b8a6e
|
* Finish task #58562.
|
2022-06-28 10:48:25 +08:00 |
|
|
liumengyi
|
cca9efbb77
|
* Finish task #58561.
|
2022-06-28 10:33:05 +08:00 |
|
|
孙广明
|
f8f88249a4
|
Merge branch 'sprint/207_mayue_bug#24059' into 'master'
* Fix bug #24059.
See merge request easycorp/zentaopms!4112
|
2022-06-23 09:36:33 +00:00 |
|
|
mayue
|
1c64648461
|
* Optimize code.
|
2022-06-23 17:29:26 +08:00 |
|