Commit Graph
2756 Commits
Author SHA1 Message Date
孙广明 8a70ffb277 * Fix bug #10735. 2022-04-26 10:38:31 +08:00
李玉春 409115aaaa Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3106
2022-04-25 05:33:23 +00:00
tianshujie 42676bf558 * Adjust the scope of modules when searching for bugs. 2022-04-25 01:27:24 +00:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
孙广明 57e90b8dbc * Fix bug for qiqi. 2022-04-22 14:42:22 +08:00
孙广明 8dec8a485b * Fix bug for qiqi. 2022-04-22 14:31:06 +08:00
孙广明 6509056a9e * Fix bug for qiqi. 2022-04-22 14:27:32 +08:00
朱金勇 4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master'
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
2022-04-22 01:36:54 +00:00
mayue 5da98433b6 * Fix bug #19933#21785. 2022-04-21 16:30:32 +08:00
孙广明 e4295fdbe5 * Code for workflow bug. 2022-04-21 10:40:56 +08:00
孙广明 7fb3a62058 * Fix workflow bug. 2022-04-21 10:24:25 +08:00
renying 6f8dfc3af3 Fixbug#21457 2022-04-20 14:03:50 +08:00
孙广明 e4738c50ea * Add required to workflow field. 2022-04-20 13:08:20 +08:00
renying d08719a839 Fixbug#21457 2022-04-20 10:28:41 +08:00
孙广明 313e39712c * Fix workflow bug. 2022-04-20 10:17:16 +08:00
孙广明 18fa7382dd * Fix workflow bug. 2022-04-19 16:39:44 +08:00
孙广明 49bbc9c0a2 * Fix export bug. 2022-04-19 14:41:52 +08:00
tianshujie 5b1c7675de * Delete extra Spaces. 2022-04-19 11:03:08 +08:00
tianshujie 9fc3f34477 * Fix bug #21682. 2022-04-18 14:33:54 +08:00
tianshujie ab1ad4051b * Fix bug #21682. 2022-04-18 11:21:54 +08:00
wangxiaomeng 8a5e5c12d5 fix_bug#17253 2022-04-15 14:27:51 +08:00
wangxiaomeng c1a51d747c fix_bug #17253 2022-04-15 14:07:42 +08:00
wangxiaomeng 4eab870165 fix_bug_17253 2022-04-15 10:29:09 +08:00
朱金勇 e63ab95fe5 Merge branch 'sprint/renying_bug17274' into 'master'
Fix bug#17274

See merge request easycorp/zentaopms!2941
2022-04-14 06:45:01 +00:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
wangxiaomeng b085ec1029 Aborting commit due to empty commit message 2022-04-14 13:56:03 +08:00
wangxiaomeng dee641a3b6 Aborting commit due to empty commit message 2022-04-14 13:21:41 +08:00
王怡栋 a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
王怡栋 940659bc12 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21576.

See merge request easycorp/zentaopms!2913
2022-04-13 05:57:24 +00:00
zhouxudong dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
tanghucheng 0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
tianshujie f6cf76e520 * Fix bug #19261. 2022-04-13 09:18:15 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
孙广明 b309300da4 Merge branch 'mayue_fix_bug#18065' into 'master'
* Fix bug#18065.

See merge request easycorp/zentaopms!2886
2022-04-12 07:58:45 +00:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
mayue 4aaefa9fb7 * Fix bug #18065. 2022-04-12 15:24:47 +08:00
zhengrunyu 9cb5cb1134 * Add api for resolve bug. 2022-04-12 14:40:48 +08:00
mayue cedd0270e2 * Optimize code. 2022-04-12 14:14:32 +08:00
mayue 3f9feedfe7 * Fix bug #18065. 2022-04-12 14:12:03 +08:00
tianshujie f2aa066bdc * Fix bug #19261. 2022-04-11 13:19:18 +08:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
2022-04-07 07:57:51 +00:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
孙广明 170393a33a Merge branch 'master_xieqiyu_20278' into 'master'
* Fix bug#20278.

See merge request easycorp/zentaopms!2774
2022-04-06 09:07:45 +00:00
孙广明 650ea1a463 Merge branch 'master_xieqiyu_21290' into 'master'
* Fix bug#21290.

See merge request easycorp/zentaopms!2765
2022-04-06 09:06:57 +00:00
xieqiyu 09fa1197f6 * Fix bug#20278. 2022-04-06 16:59:00 +08:00
zenggang 8799957c73 * Fix bug#21218 2022-04-06 08:00:21 +00:00
xieqiyu d8774117b9 * Fix bug#21290. 2022-04-06 15:36:20 +08:00