Commit Graph
38356 Commits
Author SHA1 Message Date
孙广明 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
hufangzhou 7833ed1ceb * Fix an error for 15 version upgrading. 2022-05-06 14:44:22 +08:00
孙广明 8e01d7111e Merge branch 'sunhuawei_group_getByIDTest' into 'master'
*Test group getByID.

See merge request easycorp/zentaopms!3247
2022-05-06 06:01:12 +00:00
孙广明 547a9a8862 Merge branch 'sunhuawei_test_group_getByAccount' into 'master'
*Test group getByAccount.

See merge request easycorp/zentaopms!3245
2022-05-06 06:01:03 +00:00
孙华伟 3a8165f775 Update getbyaccount.php 2022-05-06 06:00:21 +00:00
孙华伟 221e427e27 Update getbyid.php 2022-05-06 05:57:43 +00:00
孙广明 1d1facfd44 Merge branch 'mayue_autotest' into 'master'
* mayue.

See merge request easycorp/zentaopms!3244
2022-05-06 05:55:07 +00:00
王怡栋 bc4955b72b Merge branch 'sprint/hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!3246
2022-05-06 05:51:40 +00:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
孙华伟 19835d835a *Test group getByAccount. 2022-05-06 13:48:14 +08:00
mayue 3d3f0708a3 * mayue. 2022-05-06 05:48:05 +00:00
孙广明 7770df9e3c Merge branch 'mayue_autotest' into 'master'
* Add unit test for create.

See merge request easycorp/zentaopms!3243
2022-05-06 05:28:46 +00:00
mayue ba6e411dd4 * Add unit test for create. 2022-05-06 05:24:46 +00:00
孙华伟 7356711ab0 *Test group getByID. 2022-05-06 11:13:10 +08:00
= 23c0bc9140 * Delete method. 2022-05-06 10:52:54 +08:00
孙广明 32febfd349 Merge branch 'autotest_ly' into 'master'
Add weeklyreport data

See merge request easycorp/zentaopms!3242
2022-05-06 02:35:23 +00:00
liyang 074b91ff76 Add weeklyreport data 2022-05-06 10:34:20 +08:00
= 678effdb62 * Fix feedback bug. 2022-05-06 10:22:03 +08:00
孙广明 8fbb2fe0ed Merge branch 'autotest_ly' into 'master'
add data

See merge request easycorp/zentaopms!3240
2022-05-06 02:03:50 +00:00
liyang a41eec6f7d add data 2022-05-06 10:03:06 +08:00
孙广明 f48b5c4e6f Merge branch 'autotest_ly' into 'master'
add data

See merge request easycorp/zentaopms!3239
2022-05-06 01:54:36 +00:00
liyang 837cd364c7 add data 2022-05-06 09:53:31 +08:00
孙广明 5d05c728fd Merge branch 'mayue_add_group' into 'master'
* Add group module.

See merge request easycorp/zentaopms!3238
2022-05-06 01:48:53 +00:00
mayue d5ca6ae34c * Add group module. 2022-05-06 01:45:38 +00:00