Commit Graph
1909 Commits
Author SHA1 Message Date
tanghucheng 10acc6b909 * Fix merge zentaoipd code error. 2023-08-01 09:33:07 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou 923446c008 * Fix bug #35569. 2023-05-31 15:57:33 +08:00
Yagami 5935f603f4 * Change judgment condition. 2023-05-04 18:57:45 +08:00
Yagami c4c20cae54 * Change judgment condition. 2023-05-04 18:04:34 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
liumengyi 79e4cab320 * Rename priv of my-execution. 2023-04-27 16:59:04 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
朱金勇 7de8f305c0 * Fix bug#34389. 2023-04-20 04:10:07 +00:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
朱金勇 027c3260c4 * Fix bug#34386. 2023-04-19 08:18:26 +00:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +08:00
hufangzhou 103cde4dae * Merge code. 2023-04-18 15:51:03 +08:00
liumengyi 094f8f5f60 * Fix bug #33917. 2023-04-18 13:31:58 +08:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
tianshujie 12e04794a0 * Fix bug #34298. 2023-04-17 17:28:46 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
王怡栋 65e15bbf25 Merge branch 'tsj_task' into 'master'
Tsj task

See merge request easycorp/zentaopms!7419
2023-04-14 06:27:52 +00:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
朱金勇 1aa6861445 * Fix bug #34095. 2023-04-14 01:24:17 +00:00
tianshujie c24463a36b * Resolve issue #778. 2023-04-13 17:30:49 +08:00
tianshujie cb9c575ed2 * Adjust the column width of the owning object. 2023-04-13 17:07:28 +08:00
liumengyi c95c02362e * Rename the privilege of my-todo. 2023-04-13 17:02:32 +08:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
tianshujie 22f4b33a66 * Code for story #43645,43646. 2023-04-13 11:19:28 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
王怡栋 78a9facdb3 Merge branch 'tsj_task' into 'master'
* Code f or dynamic

See merge request easycorp/zentaopms!7374
2023-04-12 01:55:43 +00:00
caoyanyi 72714d554d * Modify language. 2023-04-12 09:32:15 +08:00
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
Yagami 9144abbd8a * Remove unused code. 2023-04-11 13:36:34 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
zhaoke 49d18cf72c Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-03 16:46:41 +08:00
tanghucheng 035a68b78c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-03 10:37:42 +08:00
tanghucheng c89ecac12b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 09:19:02 +08:00
tianshujie be1d498c5a * Code for task #87405. 2023-03-30 13:17:43 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
Yagami 6041f625df * Fix bug #33466. 2023-03-29 14:27:27 +08:00
wangyidong d3149400b0 * fix bug #32095. 2023-03-17 15:57:51 +08:00
wangyidong 7dc5533817 * fix bug #33002. 2023-03-17 08:48:22 +08:00
tianshujie 07e2128147 * Modify program language. 2023-03-15 11:02:06 +08:00
tianshujie bc7855e7e3 * Add skip stash page. 2023-03-14 13:50:17 +08:00
caoyanyi db1ae60517 * Adjust code. 2023-03-13 15:23:49 +08:00
guofeilong 7375d26d90 * Code for bug #32714 . 2023-03-13 14:18:55 +08:00
caoyanyi d3955d187a * Modify language for project to variable. 2023-03-06 15:29:53 +08:00
tianshujie 69b58d1646 * Add logical judgment. 2023-03-06 10:45:39 +08:00