 mayue
|
ee058f67f1
|
* Finish task #57393.
|
2022-06-15 15:09:05 +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 |
|
|
王怡栋
|
59959ef25b
|
Merge branch 'sprint/master_zhouxudong_23693' into 'master'
* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug...
See merge request easycorp/zentaopms!3934
|
2022-06-15 06:26:46 +00:00 |
|
|
zhouxudong
|
85dac08786
|
* Fix bug #23693.
|
2022-06-15 06:22:17 +00:00 |
|
|
zhouxudong
|
6307cd07e2
|
* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.
|
2022-06-15 06:20:28 +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 |
|
|
王怡栋
|
99f6d0f16f
|
Merge branch 'sprint/master_zhouxudong_56918' into 'master'
* Finish task #56918.
See merge request easycorp/zentaopms!3929
|
2022-06-15 05:33:58 +00: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 |
|
|
孙广明
|
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 |
|
|
朱金勇
|
a9b1f8e224
|
Merge branch 'cyy_zcli' into 'master'
* Modify login times limit.
See merge request easycorp/zentaopms!3925
|
2022-06-15 02:32:27 +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 |
|
|
zhouxudong
|
a5f8fdaef3
|
* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.
|
2022-06-15 01:42:32 +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 |
|
|
王怡栋
|
d40cdbef85
|
Merge branch 'sprint/hufangzhou_ciyml' into 'master'
* Temporarily cancel message.
See merge request easycorp/zentaopms!3923
|
2022-06-15 00:44:51 +00:00 |
|
|
caoyanyi
|
c1876a6dbc
|
* Modify page locate.
|
2022-06-15 08:44:13 +08:00 |
|
|
hufangzhou
|
8e3a2f7a6b
|
* Temporarily cancel message.
|
2022-06-15 08:43:31 +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 |
|
|
朱金勇
|
cb360f23fe
|
Merge branch 'master_conflictResolution' into 'master'
* Conflict resolution.
See merge request easycorp/zentaopms!3922
|
2022-06-15 00:06:01 +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 |
|
|
王怡栋
|
d5bd29198c
|
Merge branch 'sprint/hufangzhou_notify' into 'master'
* Finish task #55002.
See merge request easycorp/zentaopms!3918
|
2022-06-14 09:38:26 +00:00 |
|
|
hufangzhou
|
9ac5c54bec
|
* Modify the triggering conditions.
|
2022-06-14 17:36:47 +08:00 |
|
|
hufangzhou
|
080f54a1b2
|
* Remove the unused code.
|
2022-06-14 17:32:47 +08:00 |
|
|
zhujinyong
|
87f50aa3be
|
Merge branch 'sprint/sunhao/task56391'
|
2022-06-14 17:12:21 +08:00 |
|
|
hufangzhou
|
a1a2d4f055
|
* Add trigger condition.
|
2022-06-14 17:10:02 +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 |
|
|
hufangzhou
|
760cb05fb9
|
* Format the code.
|
2022-06-14 16:53:48 +08: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 |
|