Commit Graph
50449 Commits
Author SHA1 Message Date
tianshujie 466dea12cd * Modify case of execution model. 2023-01-29 11:18:37 +08:00
tianshujie c81992a1c2 * Add case of execution model. 2023-01-29 11:12:13 +08:00
caoyanyi 506981148e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-29 10:24:01 +08:00
caoyanyi ce13973107 * Clear team table. 2023-01-29 10:23:35 +08:00
孙广明 f019ae8119 Merge branch 'bug_30754' into 'master'
* Fix bug#30754

See merge request easycorp/zentaopms!6780
2023-01-29 00:56:20 +00:00
孙广明 b35708d760 Merge branch 'master_xieqiyu_31656' into 'master'
Master xieqiyu 31656

See merge request easycorp/zentaopms!6781
2023-01-29 00:54:38 +00:00
xieqiyu 1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
xieqiyu a9c225c532 * Fix bug#30697. 2023-01-19 09:44:56 +08:00
xieqiyu 62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
zenggang dfdefae34b * Fix bug#30754 2023-01-18 08:53:35 +00:00
xieqiyu e722cc1468 * Fix bug#30840. 2023-01-18 16:42:41 +08:00
xieqiyu 5c84bf67bf * Fix bug#30850. 2023-01-18 16:31:08 +08:00
xieqiyu 9a64cf0e50 * Fix bug#30964. 2023-01-18 16:00:17 +08:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
xieqiyu df96905ac3 * Fix bug#31656. Modify confirm bug mailto. 2023-01-18 14:13:46 +08:00
xieqiyu 55dae61471 * Fix bug#31656. 2023-01-18 13:59:20 +08:00
孙广明 d67a147527 Merge branch 'bug_31514' into 'master'
* Fix bug#31514

See merge request easycorp/zentaopms!6772
2023-01-17 03:21:22 +00:00
孙广明 bb1b001960 Merge branch 'lyk_feedback_2000' into 'master'
* Resolve feedback #2000.

See merge request easycorp/zentaopms!6775
2023-01-17 03:21:14 +00:00
孙广明 1856642e14 Merge branch 'master_xieqiyu_31708' into 'master'
Master xieqiyu 31708

See merge request easycorp/zentaopms!6776
2023-01-17 03:16:20 +00:00
xieqiyu 9644dd5206 * Fix bug#31693. 2023-01-17 11:01:22 +08:00
xieqiyu 3add478695 * Fix bug#31002. 2023-01-17 10:04:33 +08:00
xieqiyu f5e68c045e * Fix bug#31708. 2023-01-17 10:00:03 +08:00
liuyongkai 5e299fb0d6 * Resolve feedback #2000. 2023-01-17 00:58:43 +00:00
liuyongkai 99ab60df05 * Resolve feedback #2000. 2023-01-16 09:23:33 +00:00
朱金勇 d21930cb91 Merge branch 'zentaopms_bug_31668' into 'master'
* Fix bug #31668.

See merge request easycorp/zentaopms!6774
2023-01-16 07:34:07 +00:00
zhouxin 79e71b2d41 * Fix bug #31668. 2023-01-16 14:38:54 +08:00
caoyanyi e5b5cdbcf8 * Add test case. 2023-01-16 10:36:08 +08:00
zenggang 7bd4534ae3 * Fix bug#31514 2023-01-16 02:34:06 +00:00
朱金勇 32a24ad561 Merge branch 'ta_liyang' into 'master'
* Update test for user model.

See merge request easycorp/zentaopms!6771
2023-01-16 00:34:54 +00:00
liyang 634823e27f * Update test for user model. 2023-01-14 16:00:03 +08:00
wangyidong bf1130cff7 * fix bug for create linked2revision action. 2023-01-13 17:39:02 +08:00
孙广明 9554414096 Merge branch 'master_bug_27671' into 'master'
* Fix bug #27671.

See merge request easycorp/zentaopms!6766
2023-01-13 08:35:07 +00:00
孙广明 8b77fc9886 Merge branch 'master_bug_29324' into 'master'
* Fix bug #29324

See merge request easycorp/zentaopms!6767
2023-01-13 08:34:58 +00:00
孙广明 f834158ea1 Merge branch 'ta_liyang' into 'master'
* Update untest of user model.

See merge request easycorp/zentaopms!6769
2023-01-13 08:34:47 +00:00
liyang 84304d6289 * Update untest of user model. 2023-01-13 16:25:46 +08:00
王怡栋 073fad1bea Merge branch 'bugfix/excelImport' into 'master'
Fix feedback #1967, when import record ge 100 sub task error.

See merge request easycorp/zentaopms!6768
2023-01-13 07:52:11 +00:00
孔令茂 4c9f01a9e1 Fix feedback #1967, when import record ge 100 sub task error. 2023-01-13 07:51:19 +00:00
liuhong 2f57e614d4 * Fix bug #29324 2023-01-13 07:15:23 +00:00
王怡栋 14948a345e Merge branch 'bug_31517' into 'master'
* Fix bug#31517

See merge request easycorp/zentaopms!6762
2023-01-13 07:11:47 +00:00
zenggang b1208305a1 * Adjust code 2023-01-13 07:09:43 +00:00
王怡栋 6b33586e1e Merge branch 'sprint/weibufeedback' into 'master'
* Fix can bypass permissions.

See merge request easycorp/zentaopms!6765
2023-01-13 07:08:23 +00:00
王怡栋 879b06b074 Merge branch 'feedback_1954' into 'master'
* Resolve feedback#1954

See merge request easycorp/zentaopms!6763
2023-01-13 07:07:42 +00:00
王怡栋 7b83232b17 Merge branch 'zenops_46' into 'master'
Merge Zenops 46 into master

See merge request easycorp/zentaopms!6759
2023-01-13 07:05:17 +00:00
liuhong 2b48e98222 * Fix bug #27671. 2023-01-13 06:47:07 +00:00
chaideqing 971133f23d * Fix can bypass permissions. 2023-01-13 06:39:03 +00:00
caoyanyi edbd7b50ea * Add test case. 2023-01-13 14:34:23 +08:00
孙广明 a696740a96 Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6757
2023-01-13 06:13:21 +00:00
孙广明 b21a9be30e Merge branch 'master_bug_28243' into 'master'
* Fix bug #28243.

See merge request easycorp/zentaopms!6761
2023-01-13 06:12:56 +00:00
孙广明 1677e2008f Merge branch 'master_bug_30816' into 'master'
* Fix bug #30816.

See merge request easycorp/zentaopms!6764
2023-01-13 06:12:44 +00:00
caoyanyi 5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00