33543 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
孙广明	6036aa18e6	Merge branch 'fix_bug_19108' into 'master' ... * Fix bug #19108. See merge request easycorp/zentaopms!1707	2022-02-07 02:03:44 +00:00
mayue	47a5831e84	* Fix bug #19108.	2022-02-07 09:42:19 +08:00
李玉春	cf3ed8984c	Merge branch 'tianshujie_18175' into 'master' ... * Fix bug #18175. See merge request easycorp/zentaopms!1706 zentaopms_16.3	2022-01-29 08:45:37 +00:00
tianshujie	cb14ef28d5	* Fix bug #18175.	2022-01-29 15:51:21 +08:00
李玉春	e7936ef95a	Merge branch 'sprint/scx_xuanxuan_title' into 'master' ... *Xuanxuan title. See merge request easycorp/zentaopms!1705	2022-01-29 05:40:22 +00:00
songchenxuan	5847d90351	*Xuanxuan title.	2022-01-29 13:38:26 +08:00
李玉春	bc7d190e69	Merge branch 'sprint/bug_zhouxudong_19158' into 'master' ... *Fix bug #19158. See merge request easycorp/zentaopms!1704	2022-01-29 01:02:12 +00:00
zhouxudong	b767d5cbeb	*Fix bug #19158.	2022-01-29 08:52:31 +08:00
李玉春	a109c294c6	Merge branch 'kanban' into 'master' ... * Modify create execution error. See merge request easycorp/zentaopms!1703	2022-01-28 09:10:23 +00:00
tianshujie	ca5d15f13f	* Modify create execution error.	2022-01-28 17:06:43 +08:00
李玉春	58f51b83cb	Merge branch 'tianshujie_kanban' into 'master' ... * Modify the problem of creating a kanban error. See merge request easycorp/zentaopms!1702	2022-01-28 08:38:02 +00:00
tianshujie	2de963346e	* Modify the problem of creating a kanban error.	2022-01-28 16:31:03 +08:00
李玉春	18cd24f4e2	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug for view kanban. See merge request easycorp/zentaopms!1701	2022-01-28 06:56:19 +00:00
liumengyi	7b09b6daab	* Fix bug for view kanban.	2022-01-28 14:50:15 +08:00
李玉春	9c75dbe856	Merge branch 'tianshujie_kanban' into 'master' ... * Solve the problem of getting regional data. See merge request easycorp/zentaopms!1700	2022-01-28 06:37:25 +00:00
tianshujie	4394d09195	* Solve the problem of getting regional data.	2022-01-28 14:31:35 +08:00
李玉春	59a33f6d1e	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug #19126. See merge request easycorp/zentaopms!1699	2022-01-28 05:30:53 +00:00
liumengyi	06275780d2	* Modify code format.	2022-01-28 13:29:19 +08:00
liumengyi	4c26d32564	* Fix bug #19126.	2022-01-28 13:20:14 +08:00
李玉春	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