33524 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
李玉春	e2634f7dc0	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug #19119. See merge request easycorp/zentaopms!1698	2022-01-28 05:10:02 +00:00
liumengyi	8382aa2ddc	* Fix bug #19119.	2022-01-28 13:07:54 +08:00
李玉春	0c7403ec9d	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug #19119,#19121. See merge request easycorp/zentaopms!1697	2022-01-28 05:04:18 +00:00
liumengyi	8c063b581c	* Fix bug #19119,#19121.	2022-01-28 11:58:20 +08:00
李玉春	5097cb0029	Merge branch 'tianshujie_kanban' into 'master' ... * Fix work in process quantity issue. See merge request easycorp/zentaopms!1696	2022-01-28 02:53:57 +00:00
tianshujie	99f995709e	* Fix work in process quantity issue.	2022-01-28 10:51:06 +08:00
李玉春	732a1b410b	Merge branch 'devops20_zenggang' into 'master' ... zg:编辑合并请求按钮无权限改为置灰 See merge request easycorp/zentaopms!1693	2022-01-28 02:46:07 +00:00
李玉春	b7c97339c2	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug for kanban space view. See merge request easycorp/zentaopms!1695	2022-01-28 02:45:10 +00:00
李玉春	816a3d27de	Merge branch 'sprint/183_zhouxin_fix' into 'master' ... Fix bugs. See merge request easycorp/zentaopms!1694	2022-01-28 02:44:32 +00:00
liumengyi	e0b4902248	* Fix bug for kanban space view.	2022-01-28 10:27:21 +08:00
zhouxin	716b055fbf	Fix bugs.	2022-01-28 02:20:42 +00:00
zenggang	b2875e7c20	* Adjust code	2022-01-28 01:17:50 +00:00
孙广明	82a5aa5bd7	Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' ... Add title for batchcreatecard page. See merge request easycorp/zentaopms!1692	2022-01-27 08:59:15 +00:00
孙广明	d0154387a8	Merge branch 'sprint/183_leiyong' into 'master' ... * Adjusted to obtain department data through the interface. See merge request easycorp/zentaopms!1691	2022-01-27 08:57:30 +00:00
zhouxin	05e3d863bc	Add title for batchcreatecard page.	2022-01-27 08:56:08 +00:00
leiyong	5ba0b40b0e	* Adjusted to obtain department data through the interface.	2022-01-27 16:54:30 +08:00
孙广明	782d56e068	Merge branch 'tianshujie_19109' into 'master' ... * Fix bug #19109. See merge request easycorp/zentaopms!1690	2022-01-27 08:44:09 +00:00
孙广明	0ec3700200	Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' ... * Fix bug: activatecard and finishcard add to openmethods. See merge request easycorp/zentaopms!1689	2022-01-27 08:42:21 +00:00
tianshujie	cb68227989	* Fix bug #19109.	2022-01-27 16:42:07 +08:00
孙广明	afc4c18584	Merge branch 'sprint/183_hufangzhou_PROtoBIZ' into 'master' ... * Change the PRO to BIZ. See merge request easycorp/zentaopms!1687	2022-01-27 08:41:55 +00:00
xieqiyu	8efd4a500b	* Fix bug: activatecard and finishcard add to openmethods.	2022-01-27 16:39:34 +08:00
孙广明	9b35f1080a	Merge branch 'tianshujie_19070' into 'master' ... * Fix bug #19070. See merge request easycorp/zentaopms!1688	2022-01-27 08:20:07 +00:00
tianshujie	0ef9b12a2c	* Fix bug #19070.	2022-01-27 16:13:13 +08:00
孙广明	96af22c4a2	Merge branch 'Fixbug_zhengrunyu_' into 'master' ... *add padding for finish label. See merge request easycorp/zentaopms!1686	2022-01-27 07:47:48 +00:00
hufangzhou	5e7c254161	* Change the PRO to BIZ.	2022-01-27 15:47:22 +08:00
zhengrunyu	c6e92fb035	*add padding for finish label.	2022-01-27 15:45:49 +08:00
李玉春	e2e6d45dbc	Merge branch 'devops20_zenggang' into 'master' ... 优化合并请求列表api请求数 See merge request easycorp/zentaopms!1680	2022-01-27 07:45:46 +00:00
李玉春	f0c7c87228	Merge branch 'sgm_fixbug' into 'master' ... * Fix bug. See merge request easycorp/zentaopms!1683	2022-01-27 07:44:03 +00:00
zenggang	81849859ca	* Adjust code	2022-01-27 07:43:46 +00:00
孙广明	d7f34c2187	Merge branch 'sprint/183_hufangzhou_19105' into 'master' ... * Fix bug #19105. See merge request easycorp/zentaopms!1684	2022-01-27 07:43:39 +00:00
李玉春	0b53e7efb2	Merge branch 'devops_cyy_case' into 'master' ... * Modify param and check value. See merge request easycorp/zentaopms!1672	2022-01-27 07:43:32 +00:00
hufangzhou	fe653f6438	* Fix bug #19105.	2022-01-27 15:42:53 +08:00
孙广明	827308efe2	* Fix bug.	2022-01-27 15:39:14 +08:00
孙广明	a0baeb33c5	Merge branch 'devops20_liyuchun_unitcase' into 'master' ... Add unit cases. See merge request easycorp/zentaopms!1681	2022-01-27 07:37:02 +00:00
孙广明	ab273f5720	Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' ... Sprint/183 xieqiyu fixbug See merge request easycorp/zentaopms!1677	2022-01-27 07:36:25 +00:00
孙广明	c120d1c85f	Merge branch 'sprint/183_tianshujie_19065' into 'master' ... * Fix bug #19065. See merge request easycorp/zentaopms!1682	2022-01-27 07:36:01 +00:00
tianshujie	45cbb3d9d6	* Fix bug #19065.	2022-01-27 15:34:49 +08:00
liyuchun	57c6204cab	* Adjsut code style.	2022-01-27 15:32:28 +08:00
liyuchun	63121f6810	* Add unit cases.	2022-01-27 15:29:50 +08:00
zenggang	f4729ec429	* Adjust code	2022-01-27 07:23:52 +00:00
孙广明	5625fd1152	Merge branch 'Fixbug_zhengrunyu_' into 'master' ... *Fix bug for card. See merge request easycorp/zentaopms!1678	2022-01-27 07:09:30 +00:00
孙广明	0ada39cc38	Merge branch 'sprint/183_mayue_47996' into 'master' ... * Optimize code. See merge request easycorp/zentaopms!1679	2022-01-27 07:09:11 +00:00
mayue	60f1fd01d5	* Optimize code.	2022-01-27 14:59:10 +08:00
zhengrunyu	3f9410f28c	*Fix bug for card.	2022-01-27 14:58:08 +08:00
xieqiyu	cbaffa5ea9	* Fix bug#19096.	2022-01-27 14:28:06 +08:00
孙广明	bfc0888e77	Merge branch 'sprint/183_hufangzhou_18707' into 'master' ... * Fix bug #18707, #18706. See merge request easycorp/zentaopms!1676	2022-01-27 06:21:10 +00:00
孙广明	0491f40fcd	Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' ... Adjust code. See merge request easycorp/zentaopms!1674	2022-01-27 06:19:34 +00:00
hufangzhou	269907c13a	* Fix bug #18707, #18706.	2022-01-27 14:17:59 +08:00
xieqiyu	475fc0cf65	* Fix bug#19089.	2022-01-27 14:16:56 +08:00
孙广明	2cb945ddea	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug #19090. See merge request easycorp/zentaopms!1675	2022-01-27 06:08:46 +00:00