 王怡栋
|
d5c3e6a452
|
Merge branch 'sprint/master_zhouxudong_23672' into 'master'
* Fix bug #23672.
See merge request easycorp/zentaopms!3947
|
2022-06-15 09:29:16 +00:00 |
|
|
王怡栋
|
f064336c1f
|
Merge branch 'sprint/tianshujie_57095' into 'master'
* Finish task #57095.
See merge request easycorp/zentaopms!3951
|
2022-06-15 09:28:49 +00:00 |
|
|
王怡栋
|
4985d76009
|
Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.
See merge request easycorp/zentaopms!3945
|
2022-06-15 09:28:14 +00:00 |
|
|
tianshujie
|
4fcf0b7dc3
|
* Finish task #57095.
|
2022-06-15 17:26:39 +08:00 |
|
|
王怡栋
|
62d83018f0
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23775.
See merge request easycorp/zentaopms!3944
|
2022-06-15 09:23:55 +00:00 |
|
|
孙广明
|
f8e003c80b
|
Merge branch 'sprint/204_tianshujie_57095'
|
2022-06-15 17:04:10 +08:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
zhouxudong
|
3b01055e5f
|
* Fix bug #23672.
|
2022-06-15 09:00:16 +00:00 |
|
|
tianshujie
|
b6a1b3eb79
|
* Finish task #57095.
|
2022-06-15 16:55:28 +08:00 |
|
|
tianshujie
|
1f0f1ff36e
|
* Finish task #57095.
|
2022-06-15 16:52:26 +08:00 |
|
|
tianshujie
|
7f000fd968
|
* Finish task #57095.
|
2022-06-15 16:41:12 +08:00 |
|
|
孙广明
|
b5d1401b88
|
Merge branch 'liyuchun_bug' into 'master'
* Fix error.
See merge request easycorp/zentaopms!3943
|
2022-06-15 08:25:04 +00:00 |
|
|
王怡栋
|
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 |
|
|
liyuchun
|
9c675ceb6b
|
* Fix error.
|
2022-06-15 08:12:42 +00:00 |
|
|
tanghucheng
|
7d8325f469
|
* Fix bug #23775.
|
2022-06-15 16:12:03 +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 |
|
|
李玉春
|
be990c21f1
|
Merge branch 'sprint/sunhao/zui_labels' into 'master'
* optimize style for labels with outline.
See merge request easycorp/zentaopms!3939
|
2022-06-15 07:33:18 +00:00 |
|
|
Hao Sun
|
5b99adf765
|
* optimize style for labels with outline.
|
2022-06-15 07:30:51 +00:00 |
|
|
孙广明
|
9500b44b17
|
Merge branch 'fixbug_23668' into 'master'
* Fix bug #23668.
See merge request easycorp/zentaopms!3938
|
2022-06-15 07:20:13 +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 |
|
|
zhouxin
|
4fd80b7663
|
* Fix bug #23668.
|
2022-06-15 07:17:55 +00:00 |
|
|
孙广明
|
461862e284
|
Merge branch 'sprint/203_mayue_task#57393' into 'master'
* Finish task #57393.
See merge request easycorp/zentaopms!3937
|
2022-06-15 07:15:59 +00: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 |
|
|
mayue
|
ee058f67f1
|
* Finish task #57393.
|
2022-06-15 15:09:05 +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 |
|
|
王怡栋
|
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 |
|