Commit Graph
32185 Commits
Author SHA1 Message Date
tianshujie 2af6c7df8b * Fix bug #20977. 2022-04-07 14:38:41 +08:00
孙广明 a8f6e27359 * Code for project. 2022-04-07 14:36:42 +08:00
hufangzhou fe7158cf3a * Fix bug #21525. 2022-04-07 14:32:44 +08:00
李玉春 5a9dd5095b Merge branch 'fixbug_sunjun_16397' into 'master'
*Fixbug_sunjun_16397

See merge request easycorp/zentaopms!2791
2022-04-07 06:31:07 +00:00
tanghucheng 6f8d2334fd * Fix upgrade vision for litevip. 2022-04-07 14:12:57 +08:00
sunjun 6b40ab7df0 *Fixbug_sunjun_16397 2022-04-07 14:09:51 +08:00
xieqiyu d6ab24caff * Fix bug#21552. 2022-04-07 13:53:41 +08:00
李玉春 9a23e30c7a Merge branch 'devops25_51075' into 'master'
Fix bug#19960

See merge request easycorp/zentaopms!2788
2022-04-07 05:14:55 +00:00
Zongjun Lan e9b834db10 * fix bug #21423 2022-04-07 13:08:21 +08:00
李玉春 f53dbe81d9 Merge branch 'fixbugs_zhouxin_20718' into 'master'
* Fix bug #20718.

See merge request easycorp/zentaopms!2784
2022-04-07 05:05:55 +00:00
zenggang 691cde081b * Fix bug#19960 2022-04-07 03:32:14 +00:00
孙广明 9065d0527e * Add upgrade logic. 2022-04-07 11:29:49 +08:00
xieqiyu 7892d031e4 * Fix bug#21468. 2022-04-07 11:18:58 +08:00
孙广明 c286e44d55 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.

See merge request easycorp/zentaopms!2773
2022-04-07 02:44:02 +00:00
zhouxin 9400811bae * Adjust code. 2022-04-07 02:40:23 +00:00
李玉春 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
zhouxin 67f18ddd69 * Fix bug #20718. 2022-04-07 01:44:12 +00: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
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
chaideqing 0f6c3176e7 * fix show ... when text too long in xuanxuan card 2022-04-07 09:03:43 +08:00
Zongjun Lan 425b8efb64 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-07 08:46:58 +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
songchenxuan 3e7dca6598 * Add lang. 2022-04-06 17:23:31 +08:00
hufangzhou 996c0c6edb * Fix bug #15647. 2022-04-06 17:21:51 +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
Chenjianyu f0eaee1739 * Fix bug #52077, overwrite .main-actions-holder style to block infinite scrolling. 2022-04-06 17:04:36 +08: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
liyuchun 570c50b9f1 * Fix bug #16610. 2022-04-06 16:29:08 +08:00
hufangzhou 3791f6520c * Fix bug #16198. 2022-04-06 16:27:42 +08: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