王怡栋
|
a6b264d1a7
|
Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926
See merge request easycorp/zentaopms!3942
|
2022-06-15 08:20:11 +00:00 |
|
tianshujie
|
520ab92338
|
* Finish task #57095.
|
2022-06-15 16:17:16 +08:00 |
|
hufangzhou
|
d83ce3c27c
|
* Can't post the disabled value to rear end.
|
2022-06-15 16:06:39 +08:00 |
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
孙广明
|
97d6c0bca9
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.
See merge request easycorp/zentaopms!3935
|
2022-06-15 07:19:56 +00:00 |
|
liumengyi
|
764d54148d
|
* Fix bug 23744.
|
2022-06-15 15:18:47 +08:00 |
|
hufangzhou
|
9b32199272
|
* Finish task #56361.
|
2022-06-15 15:11:41 +08:00 |
|
tianshujie
|
2c176439d3
|
* Finish task #57095.
|
2022-06-15 15:09:34 +08:00 |
|
liumengyi
|
5054fd14b2
|
* Optimize code.
|
2022-06-15 15:08:58 +08:00 |
|
liumengyi
|
a77547cfa6
|
* Optimize code.
|
2022-06-15 15:07:58 +08:00 |
|
liumengyi
|
f75c14ea54
|
* Fix bug #23744.
|
2022-06-15 15:04:31 +08:00 |
|
王怡栋
|
0a6decf08a
|
Merge branch 'sgm_details' into 'master'
* Code for sprint code width.
See merge request easycorp/zentaopms!3933
|
2022-06-15 06:27:03 +00:00 |
|
王怡栋
|
3318147874
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23744.
See merge request easycorp/zentaopms!3931
|
2022-06-15 05:59:21 +00:00 |
|
liumengyi
|
023eaedf83
|
* Fix bug #23744.
|
2022-06-15 13:57:12 +08:00 |
|
孙广明
|
d568e34896
|
* Code for sprint code width.
|
2022-06-15 13:53:06 +08:00 |
|
孙广明
|
80a39e398d
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23738.
See merge request easycorp/zentaopms!3930
|
2022-06-15 05:27:13 +00:00 |
|
liumengyi
|
23be41cd71
|
* Fix bug #23738.
|
2022-06-15 13:25:41 +08:00 |
|
孙广明
|
9df2853a61
|
Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094
See merge request easycorp/zentaopms!3928
|
2022-06-15 03:09:37 +00:00 |
|
sunjun
|
1ff7d29c99
|
sprint_204_57094
|
2022-06-15 03:07:20 +00:00 |
|
sunjun
|
b4c2ecbb2f
|
sprint_204_57094
|
2022-06-15 03:02:18 +00:00 |
|
王怡栋
|
043aed24ec
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task #57089, #57099.
See merge request easycorp/zentaopms!3927
|
2022-06-15 02:21:35 +00:00 |
|
liumengyi
|
8a8666f158
|
* Finish task #57099.
|
2022-06-15 10:06:26 +08:00 |
|
liumengyi
|
9a74ea6d5d
|
* Fix bug of task #57089.
|
2022-06-15 10:05:52 +08:00 |
|
sunjun
|
a99aed925f
|
sprint_204_57094
|
2022-06-15 01:42:06 +00:00 |
|
孙广明
|
423bd7b9b9
|
Merge branch 'sprint/203_mayue_bug#23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3924
|
2022-06-15 01:08:50 +00:00 |
|
mayue
|
8099c563c3
|
* Fix bug #23586.
|
2022-06-15 08:50:16 +08:00 |
|
李玉春
|
481b40a16b
|
Merge branch 'cyy_23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3879
|
2022-06-15 00:45:00 +00:00 |
|
caoyanyi
|
c1876a6dbc
|
* Modify page locate.
|
2022-06-15 08:44:13 +08:00 |
|
caoyanyi
|
8c5d59f15d
|
* Fix bug #23633.
|
2022-06-15 08:41:06 +08:00 |
|
xieqiyu
|
cb06e1cd4d
|
* Conflict resolution.
|
2022-06-14 17:55:19 +08:00 |
|
zhujinyong
|
87f50aa3be
|
Merge branch 'sprint/sunhao/task56391'
|
2022-06-14 17:12:21 +08:00 |
|
孙广明
|
271d1b1a3b
|
Merge branch 'sprint_204_57097' into 'master'
sprint_204_57097
See merge request easycorp/zentaopms!3920
|
2022-06-14 09:09:41 +00:00 |
|
sunjun
|
1b2cd0651b
|
sprint_204_57094
|
2022-06-14 09:05:28 +00:00 |
|
sunjun
|
d84c0bf80b
|
sprint_204_57094
|
2022-06-14 09:00:35 +00:00 |
|
liumengyi
|
ee49b70482
|
* Finish task #57089.
|
2022-06-14 16:42:12 +08:00 |
|
Hao Sun
|
8d7ce128ee
|
* fix picker not update on deselect member.
|
2022-06-14 08:32:54 +00:00 |
|
sunjun
|
431a832cda
|
sprint_204_57094
|
2022-06-14 08:13:25 +00:00 |
|
Hao Sun
|
fd21045b41
|
* task #56391, support for disable selected member with picker.
|
2022-06-14 08:11:47 +00:00 |
|
Hao Sun
|
44f7de103a
|
* update zui files.
|
2022-06-14 08:11:13 +00:00 |
|
王怡栋
|
ee4ce60394
|
Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.
See merge request easycorp/zentaopms!3912
|
2022-06-14 07:26:14 +00:00 |
|
liumengyi
|
5ad98df2ca
|
* Fix bug #23648.
|
2022-06-14 15:17:57 +08:00 |
|
孙广明
|
dbb1ccc413
|
Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558
See merge request easycorp/zentaopms!3892
|
2022-06-14 06:58:39 +00:00 |
|
liumengyi
|
6aaf4f6308
|
* Fix bug for task #57090.
|
2022-06-14 14:39:55 +08:00 |
|
王怡栋
|
d682c68483
|
Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.
See merge request easycorp/zentaopms!3906
|
2022-06-14 06:30:53 +00:00 |
|
王怡栋
|
a8e7dcf2a3
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug #23648, #23650, and finish task #57090.
See merge request easycorp/zentaopms!3904
|
2022-06-14 06:29:34 +00:00 |
|
xieqiyu
|
8814f0f6dd
|
* Finish task#56931.
|
2022-06-14 14:12:57 +08:00 |
|
liumengyi
|
d1a44ab424
|
* Finish task #57090.
|
2022-06-14 13:58:18 +08:00 |
|
liumengyi
|
2d4f3be98a
|
* Finish task #57090.
|
2022-06-14 13:56:38 +08:00 |
|
liumengyi
|
347fcb16c7
|
* Fix bug #23648, #23650.
|
2022-06-14 13:47:33 +08:00 |
|
sunjun
|
3ab3059ed3
|
sprint_204_57097
|
2022-06-14 04:07:06 +00:00 |
|