32535 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tianshujie	9faee43d47	* Modify default value.	2022-01-11 17:07:40 +08:00
tianshujie	aca23db346	* Finish task #47358.	2022-01-11 17:02:17 +08:00
王怡栋	48e9171569	Merge branch 'sgm_kanban' into 'kanban' ... * Refactor kanban. See merge request easycorp/zentaopms!1349	2022-01-11 08:20:29 +00:00
孙广明	b3681c395a	* Refactor kanban.	2022-01-11 16:18:07 +08:00
孙广明	62b7f5eac1	Merge branch 'sprint/182_liumengyi_47340' into 'kanban' ... * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. See merge request easycorp/zentaopms!1344	2022-01-11 07:53:14 +00:00
liumengyi	ec74445096	* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.	2022-01-11 15:38:50 +08:00
李玉春	8cf613ac6b	Merge branch 'sgm_kanbanmodel' into 'kanban' ... Add kanban to execution. See merge request easycorp/zentaopms!1339	2022-01-11 06:14:15 +00:00
孙广明	54fc83b0fc	* Add execution kanban list.	2022-01-11 11:17:41 +08:00
孙广明	95e9f324ee	Merge branch 'sprint/182_liumengyi_47340' into 'kanban' ... * Finish task #47340, #47341. See merge request easycorp/zentaopms!1337	2022-01-11 02:19:00 +00:00
liumengyi	759841b3a5	* Fix bug for create execution.	2022-01-11 10:16:13 +08:00
liumengyi	203b97de5f	* Finish task #47340.	2022-01-11 10:14:49 +08:00
liumengyi	ddb8a4037d	* Finish task #47340, #47341.	2022-01-11 10:11:59 +08:00
王怡栋	9f778e38b5	Merge branch 'revert-3e9bcdb8' into 'master' ... Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" See merge request easycorp/zentaopms!1328	2022-01-11 00:43:35 +00:00
王怡栋	19fc483611	Merge branch 'revert-b904bc3c' into 'master' ... Revert "Merge branch 'sgm_182db' into 'master'" See merge request easycorp/zentaopms!1329	2022-01-11 00:41:01 +00:00
王怡栋	1e50b1b3e4	Merge branch 'revert-db968165' into 'master' ... Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'" See merge request easycorp/zentaopms!1331	2022-01-11 00:40:34 +00:00
孙广明	1cae18380b	Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'" ... This reverts merge request !1324	2022-01-11 00:39:37 +00:00
孙广明	9a744f651a	Revert "Merge branch 'sgm_182db' into 'master'" ... This reverts merge request !1325	2022-01-11 00:38:36 +00:00
孙广明	3ab13aa61e	Merge branch 'sprint/182_songchenxuan_action_lang' into 'master' ... *Case action lang. See merge request easycorp/zentaopms!1322	2022-01-11 00:36:32 +00:00
孙广明	b57562e99e	Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" ... This reverts merge request !1326	2022-01-11 00:35:04 +00:00
songchenxuan	bb13431274	*Fix bug 18074.	2022-01-11 08:34:55 +08:00
李玉春	b904bc3c58	Merge branch 'sgm_182db' into 'master' ... * Add upgrade.sql. See merge request easycorp/zentaopms!1325	2022-01-11 00:11:48 +00:00
zhujinyong	80765f894d	Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms	2022-01-10 21:13:52 +08:00
zhujinyong	f3e681c99f	* Add testTask table for update0.sql.	2022-01-10 21:12:04 +08:00
孙广明	714471e03b	Merge branch 'sprint/182_liumengyi_47483' into 'master' ... * Finish task #47483. See merge request easycorp/zentaopms!1327	2022-01-10 09:40:44 +00:00
liumengyi	cc3c90291d	* Finish task #47483.	2022-01-10 17:32:31 +08:00
孙广明	3e9bcdb892	Merge branch 'sprint/182_hufangzhou_47331' into 'master' ... * Finish task #47331. See merge request easycorp/zentaopms!1326	2022-01-10 09:21:23 +00:00
hufangzhou	0b9e2c0fa3	* Finish task #47331.	2022-01-10 17:18:18 +08:00
孙广明	ff6b122f3a	* Add upgrade.sql.	2022-01-10 16:46:02 +08:00
孙广明	db9681654b	Merge branch 'sprint/182_hufangzhou_47330' into 'master' ... * Finish task #47330. See merge request easycorp/zentaopms!1324	2022-01-10 08:36:39 +00:00
hufangzhou	075ac6efc5	* Adjust the lang item order.	2022-01-10 15:58:01 +08:00
hufangzhou	63226a2e84	* Finish task #47330.	2022-01-10 15:45:24 +08:00
孙广明	489c06ddb3	Merge branch 'sprint/182_tianshujie_18289' into 'master' ... * Fix bug #18289. See merge request easycorp/zentaopms!1323	2022-01-10 07:43:45 +00:00
tianshujie	0601474a78	* Fix bug #18289.	2022-01-10 15:41:24 +08:00
songchenxuan	721cdba3d3	*Case action lang.	2022-01-10 14:11:28 +08:00
孙广明	3c2fe9e87f	Merge branch 'tianshujie_fixBug' into 'master' ... * Fix bug #18287. See merge request easycorp/zentaopms!1321	2022-01-10 05:35:22 +00:00
tianshujie	1ee5fb522f	* Fix bug #18287.	2022-01-10 12:15:19 +08:00
李玉春	f08514b544	Merge branch 'devops18_18277' into 'master' ... * Fix bug#18277 See merge request easycorp/zentaopms!1316 zentaopms_16.1_20220110	2022-01-10 00:46:09 +00:00
孙广明	6ef3c5018e	Merge branch 'sprint/liyuchun_devops18' into 'master' ... * Fix bug #18264. See merge request easycorp/zentaopms!1319	2022-01-10 00:44:48 +00:00
liyuchun	ab097f3a61	* Fix bug #18264.	2022-01-10 08:39:41 +08:00
孙广明	07014ed347	Merge branch 'sprint/180_hufangzhou_18281' into 'master' ... # Fix bug #18281. See merge request easycorp/zentaopms!1317	2022-01-07 03:20:46 +00:00
hufangzhou	b1db4e4bd1	# Fix bug #18281.	2022-01-07 11:20:02 +08:00
孙广明	8626f5385f	Merge branch 'sprint/180_tianshujie_18280' into 'master' ... * Fix bug #18280. See merge request easycorp/zentaopms!1315	2022-01-07 03:04:41 +00:00
zenggang	a87d365a09	* Fix bug#18277	2022-01-07 03:03:44 +00:00
tianshujie	85773e58cd	* Fix bug #18280.	2022-01-07 11:01:47 +08:00
孙广明	8bbafaa21c	Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' ... *Fix bug for write valiable name. See merge request easycorp/zentaopms!1314	2022-01-07 02:43:35 +00:00
zhengrunyu	1f78499a4a	*Fix bug for write valiable name.	2022-01-07 10:28:30 +08:00
孙广明	7514d5d2fa	Merge branch 'sprint/181_tianshujie_17790' into 'master' ... * Fix bug #17790. See merge request easycorp/zentaopms!1313	2022-01-07 02:27:50 +00:00
tianshujie	7aee562fea	* Fix bug #17790.	2022-01-07 10:26:27 +08:00
孙广明	ba53ac9f5b	Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' ... *Fix bug for start and end time when edit it. See merge request easycorp/zentaopms!1312	2022-01-07 02:15:47 +00:00
zhengrunyu	5475eeab94	*Fix bug for start and end time when edit it.	2022-01-07 10:11:36 +08:00