 李玉春
|
6d9a40f24d
|
Merge branch 'devops25_zenggang' into 'master'
Fix bug#20886,16610
See merge request easycorp/zentaopms!2783
|
2022-04-07 02:39:56 +00:00 |
|
|
李玉春
|
efe4dedfd8
|
Merge branch 'fixbug_sunjun_17344' into 'master'
Fixbug sunjun 17344
See merge request easycorp/zentaopms!2785
|
2022-04-07 02:23:14 +00:00 |
|
|
sunjun
|
bf8c28ebe8
|
*Fixbug_sunjun_17344
|
2022-04-07 10:20:36 +08:00 |
|
|
zenggang
|
2429bc7f6e
|
* Fix bug#20886,16610
|
2022-04-07 01:58:09 +00:00 |
|
|
sunjun
|
aa9ffc738c
|
*Fixbug_sunjun_17344
|
2022-04-07 09:56:55 +08:00 |
|
|
李玉春
|
6fdf05ad71
|
Merge branch 'sprint/sunhao/table_dorpdown_position' into 'master'
fix z-index conflict with pager dropmenu for fixed header in datatable.
See merge request easycorp/zentaopms!2776
|
2022-04-07 01:43:11 +00:00 |
|
|
sunjun
|
e64527e7a0
|
*Fixbug_sunjun_17344
|
2022-04-07 09:25:13 +08:00 |
|
|
tianshujie
|
2017a13bc8
|
* Fix bug #14961.
|
2022-04-07 08:19:04 +08:00 |
|
|
tianshujie
|
1dc225aecf
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug19813
|
2022-04-07 08:14:08 +08:00 |
|
|
xieqiyu
|
8d877ea731
|
* Fix bug#18689.
|
2022-04-06 17:21:02 +08:00 |
|
|
sunjun
|
365f6718c4
|
*Fixbug #17344
|
2022-04-06 17:12:01 +08:00 |
|
|
孙广明
|
62656bde9e
|
Merge branch 'master_xieqiyu_17296' into 'master'
* Fix bug#17296.
See merge request easycorp/zentaopms!2763
|
2022-04-06 09:10:52 +00:00 |
|
|
朱金勇
|
ecbbc59166
|
Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest
See merge request easycorp/zentaopms!2775
|
2022-04-06 09:09:27 +00:00 |
|
|
Hao Sun
|
2b9068f51c
|
fix z-index conflict with pager dropmenu for fixed header in datatable.
|
2022-04-06 17:09:24 +08:00 |
|
|
xieqiyu
|
22a74fe4bc
|
* Modify review code.
|
2022-04-06 17:09:08 +08:00 |
|
|
孙广明
|
170393a33a
|
Merge branch 'master_xieqiyu_20278' into 'master'
* Fix bug#20278.
See merge request easycorp/zentaopms!2774
|
2022-04-06 09:07:45 +00:00 |
|
|
孙广明
|
650ea1a463
|
Merge branch 'master_xieqiyu_21290' into 'master'
* Fix bug#21290.
See merge request easycorp/zentaopms!2765
|
2022-04-06 09:06:57 +00:00 |
|
|
xieqiyu
|
09fa1197f6
|
* Fix bug#20278.
|
2022-04-06 16:59:00 +08:00 |
|
|
李玉春
|
ab11f42a19
|
Merge branch 'devops24_52072' into 'master'
Fix bug#21135
See merge request easycorp/zentaopms!2766
|
2022-04-06 08:53:06 +00:00 |
|
|
李玉春
|
ee99123c52
|
Merge branch 'sprint/master_zhouxudong_16780' into 'master'
* Fix bug #18545.
See merge request easycorp/zentaopms!2770
|
2022-04-06 08:46:53 +00:00 |
|
|
zhouxudong
|
37f76d050f
|
* Fix bug #18545.
|
2022-04-06 16:45:30 +08:00 |
|
|
zenggang
|
790932d79d
|
* Fix bug#20909
|
2022-04-06 08:43:29 +00:00 |
|
|
孙广明
|
bd895ca244
|
* Add project test and fix bug.
|
2022-04-06 16:01:06 +08:00 |
|
|
zenggang
|
8799957c73
|
* Fix bug#21218
|
2022-04-06 08:00:21 +00:00 |
|
|
zhouxudong
|
c776289815
|
* Fix bug #16780.
|
2022-04-06 16:00:00 +08:00 |
|
|
李玉春
|
4f42d628fc
|
Merge branch 'cyy_20309' into 'master'
* Fix bug #20309.
See merge request easycorp/zentaopms!2768
|
2022-04-06 07:48:25 +00:00 |
|
|
caoyanyi
|
ae8728b5da
|
* Fix bug #20309.
|
2022-04-06 15:46:25 +08:00 |
|
|
李玉春
|
7dc812188f
|
Merge branch 'sunhuawei_fixbug_21514' into 'master'
*Fix bug#21514.
See merge request easycorp/zentaopms!2767
|
2022-04-06 07:45:27 +00:00 |
|
|
李玉春
|
d9393143a6
|
Merge branch 'sprint/tianshujie_bug18710' into 'master'
* Fix bug #18710.
See merge request easycorp/zentaopms!2764
|
2022-04-06 07:39:25 +00:00 |
|
|
xieqiyu
|
d8774117b9
|
* Fix bug#21290.
|
2022-04-06 15:36:20 +08:00 |
|
|
孙华伟
|
a10b23a5c0
|
*Fix bug#21514.
|
2022-04-06 15:24:00 +08:00 |
|
|
tianshujie
|
0530b892e4
|
* Fix bug #18710.
|
2022-04-06 15:22:15 +08:00 |
|
|
李玉春
|
64f7e522bf
|
Merge branch 'devops24_51071' into 'master'
Finish task#51071
See merge request easycorp/zentaopms!2760
|
2022-04-06 06:42:07 +00:00 |
|
|
zenggang
|
badb961a37
|
* Adjust code
|
2022-04-06 06:27:49 +00:00 |
|
|
zenggang
|
6cdf575678
|
* Adjust code
|
2022-04-06 06:07:46 +00:00 |
|
|
zenggang
|
c149ac6299
|
* Adjust code
|
2022-04-06 06:03:03 +00:00 |
|
|
xieqiyu
|
d8ef00183b
|
* Fix bug#17296.
|
2022-04-06 13:47:49 +08:00 |
|
|
孙华伟
|
3eb12785f1
|
*Fix bug#18381.
|
2022-04-06 13:37:19 +08:00 |
|
|
tianshujie
|
8aa61bfc0e
|
* Fix bug #14961.
|
2022-04-06 13:31:56 +08:00 |
|
|
朱金勇
|
a70a61f078
|
Merge branch 'spring/sunhao/bug18928' into 'master'
* bug #18928, fix switch button not work when statistic block place in right side.
See merge request easycorp/zentaopms!2747
|
2022-04-06 05:28:50 +00:00 |
|
|
zenggang
|
8e0fc555c8
|
* Fix bug#11398
|
2022-04-06 05:19:30 +00:00 |
|
|
王怡栋
|
d75d09e70a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-06 13:14:16 +08:00 |
|
|
王怡栋
|
4f5529867b
|
* code for bug #20933.
|
2022-04-06 13:13:29 +08:00 |
|
|
zenggang
|
4b87e07830
|
* Finish task#51071
|
2022-04-06 04:16:24 +00:00 |
|
|
xieqiyu
|
c4e9e00959
|
* Fix bug#13881.
|
2022-04-06 09:49:30 +08:00 |
|
|
李玉春
|
0bcc43bdff
|
Merge branch 'cyy_20793' into 'master'
* Fix bug #20793.
See merge request easycorp/zentaopms!2741
|
2022-04-06 01:40:29 +00:00 |
|
|
tianshujie
|
7b731b4a47
|
* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.
|
2022-04-06 08:54:57 +08:00 |
|
|
xieqiyu
|
843c14c894
|
* Fix bug#6948.
|
2022-04-06 08:46:23 +08:00 |
|
|
tianshujie
|
824724f657
|
* Fix bug #19813.
|
2022-04-02 20:16:00 +08:00 |
|
|
王怡栋
|
598a6eb7e9
|
Merge branch 'sprint/fixbug_hufangzhou_16115' into 'master'
* Fix bug #16115.
See merge request easycorp/zentaopms!2745
|
2022-04-02 09:17:13 +00:00 |
|