 xieqiyu
|
58e7a4ff19
|
* Finish task#56930,56929,56928.
|
2022-06-15 15:32:33 +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 |
|
|
孙广明
|
6656dd71a5
|
Merge branch 'sprint_204_57093' into 'master'
Sprint 204 57093
See merge request easycorp/zentaopms!3919
|
2022-06-15 03:09:10 +00:00 |
|
|
sunjun
|
1ff7d29c99
|
sprint_204_57094
|
2022-06-15 03:07:20 +00:00 |
|
|
sunjun
|
a4b45ab9ff
|
sprint_204_57093
|
2022-06-15 03:03:28 +00:00 |
|
|
sunjun
|
b4c2ecbb2f
|
sprint_204_57094
|
2022-06-15 03:02:18 +00:00 |
|
|
sunjun
|
ad72c54ce8
|
sprint_204_57093
|
2022-06-15 02:56:33 +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 |
|
|
孙广明
|
7ef456bb6b
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of program list in normal user.
See merge request easycorp/zentaopms!3926
|
2022-06-15 02:08:42 +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 |
|
|
xieqiyu
|
770f4f978d
|
* Fix bug of program list in normal user.
|
2022-06-15 10:03:14 +08:00 |
|
|
sunjun
|
a3f6e18f93
|
sprint_204_57093
|
2022-06-15 01:48:14 +00: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 |
|
|
王怡栋
|
5d928bf027
|
Merge branch 'master_xieqiyu_56923' into 'master'
* Finish task#56923.
See merge request easycorp/zentaopms!3921
|
2022-06-15 00:25:48 +00:00 |
|
|
xieqiyu
|
cb06e1cd4d
|
* Conflict resolution.
|
2022-06-14 17:55:19 +08:00 |
|
|
朱金勇
|
cb9a0b6af9
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.
See merge request easycorp/zentaopms!3916
|
2022-06-14 09:44:45 +00:00 |
|
|
xieqiyu
|
e9e66259c1
|
* Finish task#56923.
|
2022-06-14 17:42:50 +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 |
|
|
sunjun
|
0a485ebec9
|
sprint_204_57093
|
2022-06-14 08:56:26 +00:00 |
|
|
李玉春
|
4740125462
|
Merge branch 'sprint/203_mayue_bug23184' into 'master'
* Fix bug #23184.
See merge request easycorp/zentaopms!3913
|
2022-06-14 08:50:25 +00:00 |
|
|
liumengyi
|
ee49b70482
|
* Finish task #57089.
|
2022-06-14 16:42:12 +08:00 |
|
|
Hao Sun
|
86b1c3f82d
|
* support for update picker options in select project member.
|
2022-06-14 08:33:12 +00:00 |
|
|
mayue
|
51f3db8f40
|
* Optimize code.
|
2022-06-14 16:32:57 +08:00 |
|
|
Hao Sun
|
8d7ce128ee
|
* fix picker not update on deselect member.
|
2022-06-14 08:32:54 +00:00 |
|
|
王怡栋
|
7c60199c84
|
Merge branch 'master_xieqiyu_56919' into 'master'
* Finish task#56919.
See merge request easycorp/zentaopms!3914
|
2022-06-14 08:21:41 +00:00 |
|
|
王怡栋
|
1c98c75274
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #23680.
See merge request easycorp/zentaopms!3915
|
2022-06-14 08:20:57 +00:00 |
|
|
孙广明
|
e31b570be2
|
* Fix bug #23680.
|
2022-06-14 16:18:34 +08: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 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
xieqiyu
|
c03d486fab
|
* Finish task#56919.
|
2022-06-14 15:55:48 +08:00 |
|
|
mayue
|
92c7801528
|
* Fix bug #23184.
|
2022-06-14 15:44:54 +08: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 |
|
|
王怡栋
|
71fb547445
|
Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.
See merge request easycorp/zentaopms!3910
|
2022-06-14 07:19:42 +00:00 |
|
|
王怡栋
|
dce5aa0a23
|
Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915
See merge request easycorp/zentaopms!3909
|
2022-06-14 07:18:50 +00:00 |
|
|
liumengyi
|
5ad98df2ca
|
* Fix bug #23648.
|
2022-06-14 15:17:57 +08:00 |
|
|
王怡栋
|
fd8c9b0f9a
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Finish story #33374.
See merge request easycorp/zentaopms!3911
|
2022-06-14 07:14:07 +00:00 |
|
|
tanghucheng
|
1f1b79948a
|
* Finish story #33374.
|
2022-06-14 15:03:36 +08:00 |
|
|
xieqiyu
|
38dad8467f
|
* Finish task#56922.
|
2022-06-14 15:00:08 +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 |
|