Commit Graph

35409 Commits

Author SHA1 Message Date
Zongjun Lan
b3bb1036b9 * fix bug #20922 2022-03-18 10:50:56 +08:00
Zongjun Lan
2af12a5c0d * fix bug #20905 2022-03-18 10:12:06 +08:00
Zongjun Lan
4c8a7a3eae * fix bug #20905 2022-03-18 10:11:22 +08:00
Zongjun Lan
2435d84cdc * fix bug #20905 2022-03-18 10:06:04 +08:00
Zongjun Lan
9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08:00
朱金勇
4f2780027d Merge branch 'sgm_usercase' into 'master'
Sgm usercase

See merge request easycorp/zentaopms!2355
2022-03-18 01:24:42 +00:00
孙广明
19d86da89f Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20712,20800.

See merge request easycorp/zentaopms!2313
2022-03-18 01:21:20 +00:00
tanghucheng
ec5f6244dd * Fix bug #20906. 2022-03-18 09:18:34 +08:00
sgm0422
cebc26863a * Remove unused code. 2022-03-18 09:16:55 +08:00
sgm0422
9e53d5bbf8 * Finish user auto test. 2022-03-18 09:14:11 +08:00
sgm0422
ab5db10f05 * Add user auto test. 2022-03-17 17:30:47 +08:00
李玉春
f6e47fb1ce Merge branch 'tianshujie_upgrade' into 'master'
* Delete useless files when upgrading.

See merge request easycorp/zentaopms!2353
2022-03-17 09:25:12 +00:00
孙广明
2d13ee0616 Merge branch 'autotest_ly' into 'master'
add doclib data

See merge request easycorp/zentaopms!2352
2022-03-17 09:23:59 +00:00
tianshujie
8089de48b7 * Delete useless files when upgrading. 2022-03-17 17:23:16 +08:00
liyang
dff861e2d1 add doclib data 2022-03-17 17:20:09 +08:00
孙广明
4b68b7c78c Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2350
2022-03-17 09:13:33 +00:00
liumengyi
bb361baa6e * Add function annotation. 2022-03-17 17:12:08 +08:00
liumengyi
7e85558c74 * Add auto test of bug. 2022-03-17 17:10:55 +08:00
朱金勇
04b88a9e49 Merge branch 'tianshujie_upgrade' into 'master'
* Fix bug of ext files.

See merge request easycorp/zentaopms!2346
2022-03-17 08:43:08 +00:00
tianshujie
4d7112b9b7 * Fix bug of ext files. 2022-03-17 16:41:29 +08:00
孙广明
60fa02e648 Merge branch 'autotest_ly' into 'master'
rm surplus data

See merge request easycorp/zentaopms!2338
2022-03-17 06:06:46 +00:00
liyang
33f827522e rm surplus data 2022-03-17 14:03:05 +08:00
朱金勇
daeedd520b Merge branch 'sgm_usercase' into 'master'
* Add user test unit.

See merge request easycorp/zentaopms!2332
2022-03-17 06:01:12 +00:00
孙广明
ee15271a2f Merge branch 'autotest_ly' into 'master'
rm move.sh and runtime.zip

See merge request easycorp/zentaopms!2335
2022-03-17 05:58:27 +00:00
liyang
53e1f051bb rm move.sh and runtime.zip 2022-03-17 13:55:51 +08:00
sgm0422
44395a2ef5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sgm_usercase 2022-03-17 13:52:05 +08:00
孙广明
a253bc2246 Merge branch 'autotest_ly' into 'master'
update bug story data

See merge request easycorp/zentaopms!2333
2022-03-17 05:47:09 +00:00
liyang
6f7a1d32d4 update bug story data 2022-03-17 13:44:39 +08:00
sgm0422
bcc2100a0a * Add user test unit. 2022-03-17 13:40:02 +08:00
孙广明
d4105656d1 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2329
2022-03-17 05:27:55 +00:00
孙广明
808ca1ee66 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2330
2022-03-17 05:27:17 +00:00
liyang
88af905a7a update executon class 2022-03-17 13:25:09 +08:00
liyang
46e54767fb add guest data 2022-03-17 13:23:05 +08:00
liumengyi
d2adc653d4 * Add auto test of bug. 2022-03-17 13:22:35 +08:00
liyang
2431a437de add userview data 2022-03-17 13:16:22 +08:00
孙广明
2a4bbc6261 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2327
2022-03-17 03:16:40 +00:00
liumengyi
455410f3af * Add function annotations. 2022-03-17 11:13:28 +08:00
liumengyi
b0a66982be * Add auto test of bug. 2022-03-17 11:00:52 +08:00
tanghucheng
18cd2a98aa * Adjust for vision name. 2022-03-17 10:24:41 +08:00
朱金勇
2ae97554eb Merge branch 'sprint/187_hufangzhou_sql' into 'master'
* Fix sql.

See merge request easycorp/zentaopms!2322
2022-03-17 02:07:57 +00:00
hufangzhou
8011a9dc0e * Fix sql. 2022-03-17 10:05:40 +08:00
王怡栋
e865920607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 16:46:25 +08:00
王怡栋
69d7749489 * code for welcome block. 2022-03-16 16:35:33 +08:00
tanghucheng
bc67d443e2 * Fix bug #20712,20800. 2022-03-16 16:21:12 +08:00
朱金勇
dd15735c4f Merge branch 'sgm_upgrade' into 'master'
* Remove unused code.

See merge request easycorp/zentaopms!2312
2022-03-16 07:49:13 +00:00
孙广明
d058c26177 * Remove unused code. 2022-03-16 15:48:03 +08:00
王怡栋
83738dadb6 Merge branch 'sgm_unittest' into 'master'
Sgm unittest

See merge request easycorp/zentaopms!2310
2022-03-16 07:20:59 +00:00
王怡栋
22406348f6 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20787

See merge request easycorp/zentaopms!2306
2022-03-16 07:14:08 +00:00
孙广明
b9d5745fc7 * Code for unittest. 2022-03-16 15:10:02 +08:00
王怡栋
6b44c9e08b Merge branch 'sprint/187_hufangzhou_globalSearch' into 'master'
* Adjust the width of global search box.

See merge request easycorp/zentaopms!2309
2022-03-16 07:09:02 +00:00