Commit Graph
36903 Commits
Author SHA1 Message Date
renying c0c75efea2 deal confilect 2022-04-02 18:01:03 +08:00
yinjinzhu e40adde8cb auto test release model 2022-04-02 17:42:47 +08:00
zhangxuwen c2b4f5d8b3 auto test cron model 2022-04-02 14:58:34 +08:00
王怡栋 534ed4e9d8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21422#21455#21413

See merge request easycorp/zentaopms!2733
2022-04-02 06:53:04 +00:00
Zongjun Lan 6865f5cdd6 * fix bug 2022-04-02 14:52:33 +08:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
2022-04-02 06:49:30 +00:00
孙广明 51499d6b8c Merge branch 'sprint/master_zhouxudong_21378' into 'master'
* Fix bug #21378.

See merge request easycorp/zentaopms!2737
2022-04-02 06:48:47 +00:00
Zongjun Lan 1542533e44 * fix bug #21455#21413 2022-04-02 14:36:13 +08:00
李玉春 8329ed43fa Merge branch 'devops24_zenggang' into 'master'
Fix bug#13131,16610

See merge request easycorp/zentaopms!2718
2022-04-02 06:32:21 +00:00
zhouxudong c0bf8f5275 * Fix bug #21378. 2022-04-02 14:16:09 +08:00
李玉春 f59b0c428d Merge branch 'mayue_fix_bug#21359' into 'master'
* Fix bug #21359.

See merge request easycorp/zentaopms!2716
2022-04-02 06:13:35 +00:00
李玉春 8da183c51b Merge branch 'fixbug_sunjun_20719' into 'master'
Fixbug sunjun 20719

See merge request easycorp/zentaopms!2726
2022-04-02 06:12:59 +00:00
mayue cb5f72d34e * Optimize code. 2022-04-02 14:11:23 +08:00
李玉春 46a965b02b Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.

See merge request easycorp/zentaopms!2662
2022-04-02 06:05:51 +00:00
caoyanyi 59efd44767 * Adjust codes. 2022-04-02 14:03:23 +08:00
孙广明 0bffcc0b85 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2734
2022-04-02 05:45:47 +00:00
liumengyi 9a0dd11141 * Add auto test of kanban. 2022-04-02 13:43:38 +08:00
Zongjun Lan 8c09028685 * fix bug #21422 2022-04-02 13:13:35 +08:00
孙广明 a1726a54dc Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2732
2022-04-02 05:03:48 +00:00
liumengyi e1309a74f9 * Add auto test of kanban. 2022-04-02 12:06:44 +08:00
王怡栋 94db1137f2 Merge branch 'sprint/fixbug_hufangzhou_15617' into 'master'
* Fix bug #15617.

See merge request easycorp/zentaopms!2730
2022-04-02 03:30:10 +00:00
hufangzhou 02d1b146fe * Fix bug #15617. 2022-04-02 11:27:37 +08:00
孙广明 8de6d91871 Merge branch 'autotest_ly' into 'master'
update kanbancolumn data

See merge request easycorp/zentaopms!2728
2022-04-02 03:14:18 +00:00
liyang 9808e58bed update kanbancolumn data 2022-04-02 11:10:59 +08:00
zhangxuwen 82e18ab5ec auto test cron model 2022-04-02 11:05:40 +08:00
王怡栋 0c669263ba Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18722#19905#21424

See merge request easycorp/zentaopms!2708
2022-04-02 02:59:57 +00:00
王怡栋 6101b71209 Merge branch 'sprint/fixbug_hufangzhou_21304' into 'master'
* Fix bug #21304.

See merge request easycorp/zentaopms!2727
2022-04-02 02:58:59 +00:00
Zongjun Lan f61cdef8d0 * fix bug #21424 2022-04-02 10:56:10 +08:00
hufangzhou 0608a7dadb * Fix bug #21304. 2022-04-02 10:55:16 +08:00
zhujinyong 9a97e8d11d + Add submodule qucheng. 2022-04-02 10:53:40 +08:00
王怡栋 b799261c19 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2725
2022-04-02 02:39:23 +00:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie a9b0b2127a * Fix bug #21401. 2022-04-02 10:26:41 +08:00
孙广明 19c7ce9a37 Merge branch 'mayue_fix_bug#21435' into 'master'
* Fix bug #21435.

See merge request easycorp/zentaopms!2724
2022-04-02 02:23:21 +00:00
孙广明 e04242a2b9 Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.

See merge request easycorp/zentaopms!2715
2022-04-02 02:19:19 +00:00
孙广明 3718a90a21 Merge branch 'master_xieqiyu_21383' into 'master'
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
2022-04-02 02:19:05 +00:00
孙广明 3e8175b22e Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2711
2022-04-02 02:18:37 +00:00
朱金勇 29609debae Merge branch 'sgm_programtest' into 'master'
Sgm programtest

See merge request easycorp/zentaopms!2723
2022-04-02 02:15:35 +00:00
mayue f54b38b241 * Fix bug #21435. 2022-04-02 10:15:33 +08:00
tianshujie bb6581b99a * Fix bug #18273. 2022-04-02 10:14:26 +08:00
tianshujie a1eb251907 * Fix bug #15460,17587. 2022-04-02 10:13:13 +08:00
孙广明 254bd17765 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2722
2022-04-02 02:11:31 +00:00
liumengyi 00df2c288a * Add auto test of kanban. 2022-04-02 10:10:28 +08:00
liumengyi e1681277d6 * Add auto test of kanban. 2022-04-02 10:09:13 +08:00
Zongjun Lan b3c861aa05 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-02 09:59:54 +08:00
孙广明 e3e050f3e3 * Add program test. 2022-04-02 09:58:00 +08:00
xieqiyu cdd7396261 * Add space line. 2022-04-02 09:56:31 +08:00
孙广明 03bd3c1d0f Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2721
2022-04-02 01:56:29 +00:00
xieqiyu 979fb8b587 * Fix bug#20719. 2022-04-02 09:54:43 +08:00
liyang 69936fdde5 add test by my 2022-04-02 09:54:04 +08:00