Commit Graph
38379 Commits
Author SHA1 Message Date
liumengyi 87e4148d22 * Add unit test of file. 2022-05-07 10:58:07 +08:00
liyuchun 40f9664724 Merge branch 'cyy_test' 2022-05-07 02:53:34 +00:00
李玉春 45586621ac Merge branch 'master' into 'cyy_test'
# Conflicts:
#   test/ztest
2022-05-07 02:52:56 +00:00
李玉春 b39ee89055 Merge branch 'autotest_wangxiaomeng' into 'master'
weekly unit tests

See merge request easycorp/zentaopms!3266
2022-05-07 02:50:18 +00:00
wangxiaomeng 80fea70b03 edit weekly 2022-05-07 10:42:49 +08:00
caoyanyi d27114d98d * Remove bind func. 2022-05-07 10:32:17 +08:00
wangxiaomeng 10020ed142 edit weekly 2022-05-07 10:31:54 +08:00
caoyanyi 31944ec84f * Add sso test case. 2022-05-07 10:31:14 +08:00
孙广明 945393bfde Merge branch 'autotest_ly' into 'master'
Add notify data

See merge request easycorp/zentaopms!3265
2022-05-07 02:27:19 +00:00
liyang a667418b50 Add notify data 2022-05-07 10:26:34 +08:00
wangxiaomeng 2dea32e6be edit weekly 2022-05-07 10:25:48 +08:00
wangxiaomeng 319ec152a2 edit weekly 2022-05-07 10:18:27 +08:00
孙广明 647208c827 Merge branch 'autotest_ly' into 'master'
Add data

See merge request easycorp/zentaopms!3264
2022-05-07 02:13:53 +00:00
liyang 7eddd0aad5 Add data 2022-05-07 10:12:34 +08:00
孙广明 7e04ce3fb7 Merge branch 'test_sunjun1' into 'master'
test_sunjun1

See merge request easycorp/zentaopms!3263
2022-05-07 02:03:15 +00:00
孙广明 192198a02f Merge branch 'test_sunjun' into 'master'
test_sunjun

See merge request easycorp/zentaopms!3262
2022-05-07 02:03:09 +00:00
wangxiaomeng 909c567b75 edit weekly 2022-05-07 09:57:37 +08:00
sunjun 48b8726600 test_sunjun1 2022-05-07 01:56:15 +00:00
wangxiaomeng 54fe0bd623 edit weekly 2022-05-07 09:46:30 +08:00
sunjun 3ceae4320f test_sunjun 2022-05-07 01:41:38 +00:00
孙广明 6598915476 Merge branch 'liyuchun_unittest' into 'master'
* Add unit test.

See merge request easycorp/zentaopms!3261
2022-05-07 01:25:20 +00:00
liyuchun bc11d6a8a0 * Add unit test. 2022-05-07 01:22:13 +00:00
wangxiaomeng 10415b3172 edit weekly 2022-05-07 08:56:58 +08:00
孙广明 68c99f281f Merge branch 'autotest_renying' into 'master'
Add weekly module auto test.

See merge request easycorp/zentaopms!3260
2022-05-07 00:41:04 +00:00
renying a6d2780d2e Add weekly module auto test. 2022-05-07 08:37:36 +08:00
孙广明 cdb42adc31 Merge branch 'autotest_ly' into 'master'
add doc data

See merge request easycorp/zentaopms!3257
2022-05-07 00:37:11 +00:00
李玉春 3bd94b2ed0 Merge branch 'testcase_tianshujie' into 'master'
* Add test case file.

See merge request easycorp/zentaopms!3259
2022-05-07 00:34:20 +00:00
tianshujie 95ae927251 * Add test case file. 2022-05-07 08:31:55 +08:00
wangyidong 8d1f35aaf9 * Add for git unit. 2022-05-06 17:33:43 +08:00
liyang 30170a62ba add doc data 2022-05-06 17:28:52 +08:00
孙广明 ec76ee1daf Merge branch 'testcase_zhouxin_1' into 'master'
* Add tsetcase for holiday.

See merge request easycorp/zentaopms!3256
2022-05-06 09:23:24 +00:00
zhouxin d1ebd38016 * Add tsetcase for holiday. 2022-05-06 09:19:37 +00:00
孙广明 aa0d573951 Merge branch 'sprint/master_zhouxudong_message' 2022-05-06 17:17:29 +08:00
孙广明 6ccf895cc5 Merge branch 'master' into 'sprint/master_zhouxudong_message'
# Conflicts:
#   test/ztest
2022-05-06 09:17:11 +00:00
zhouxudong 3f01f1a0a1 * Add message auto test. 2022-05-06 09:10:18 +00:00
李玉春 36dd00618b Merge branch 'sprint/unitTest_liumengyi_file' into 'master'
* Add unit test of file.

See merge request easycorp/zentaopms!3255
2022-05-06 09:10:15 +00:00
liumengyi fb9ef220fc * Add unit test of file. 2022-05-06 17:07:55 +08:00
王怡栋 48d33a7564 Merge branch 'sgm_testext' into 'master'
* Finish extension.

See merge request easycorp/zentaopms!3253
2022-05-06 08:54:39 +00:00
孙广明 547b9202a8 * Delete file. 2022-05-06 16:54:06 +08:00
孙广明 051ab16bc3 Merge branch 'sprint/scx_feedback' into 'master'
Sprint/scx feedback

See merge request easycorp/zentaopms!3241
2022-05-06 08:50:55 +00:00
zhouxudong 6aa6b5ba43 * Add message auto test. 2022-05-06 08:48:34 +00:00
孙广明 978df1a64c * Finish extension. 2022-05-06 16:46:56 +08:00
zhouxudong b5c00ba209 * Add message auto test. 2022-05-06 08:37:11 +00:00
孙广明 6e48de582b Merge branch 'autotest_ly' into 'master'
Add data

See merge request easycorp/zentaopms!3252
2022-05-06 08:26:26 +00:00
liyang d654b6af8e Add data 2022-05-06 16:18:18 +08:00
王怡栋 b5735ec037 Merge branch 'sprint/daitingting_flow_flow' into 'master'
* Update setFlowURI and mergeParams function according to zdoo.

See merge request easycorp/zentaopms!3251
2022-05-06 08:17:49 +00:00
daitingting 59b1e62590 * Update setFlowURI and mergeParams function according to zdoo. 2022-05-06 07:36:11 +00:00
孙广明 087275c12e Merge branch 'autotest_ly' into 'master'
Add extension data

See merge request easycorp/zentaopms!3250
2022-05-06 07:28:34 +00:00
liyang 9cd6b6d0c1 Add extension data 2022-05-06 15:06:01 +08:00
孙广明 5a40e3ad3c Merge branch 'sprint/hufangzhou_package' into 'master'
* Fix an error for 15 version upgrading.

See merge request easycorp/zentaopms!3249
2022-05-06 06:45:40 +00:00