Commit Graph
38052 Commits
Author SHA1 Message Date
hufangzhou 0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
wangyidong 2d82ad3e79 * fix bug. 2022-04-27 10:33:03 +08:00
wangyidong 9508d7729b * code for bug #21400. 2022-04-27 09:55:50 +08:00
wangyidong 0e2c27746d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-27 09:37:18 +08:00
wangyidong 899c123dac * code for bug #19303. 2022-04-27 09:37:01 +08:00
朱金勇 aac46fee79 Merge branch 'sprint/fixbug_hufangzhou_22016' into 'master'
* Fix bug #22016.

See merge request easycorp/zentaopms!3138
2022-04-27 00:26:24 +00:00
朱金勇 f26d53d3fd Merge branch 'sprint/fixbug_hufangzhou_17203' into 'master'
* Fix bug #17203.

See merge request easycorp/zentaopms!3136
2022-04-27 00:26:04 +00:00
王怡栋 04af0c5055 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #15814

See merge request easycorp/zentaopms!3139
2022-04-27 00:19:19 +00:00
孙广明 9acdea42c1 Merge branch 'mayue_fix_bug#10878' into 'master'
* Fix bug #10878.

See merge request easycorp/zentaopms!3142
2022-04-26 09:21:24 +00:00
mayue 18b70b3208 * Fix bug #10878. 2022-04-26 09:18:13 +00:00
孙广明 8010daa536 Merge branch 'sprint/master_zhouxudong_15338' into 'master'
* Fix bug #15338.

See merge request easycorp/zentaopms!3140
2022-04-26 09:12:31 +00:00
zhouxudong 9851bc1047 * Fix bug #15338. 2022-04-26 09:10:29 +00:00
王怡栋 fb8609f174 Merge branch 'fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!3141
2022-04-26 09:09:31 +00:00
tanghucheng dc86a15a62 * Fix bug . 2022-04-26 17:07:12 +08:00
zhouxudong a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
lanzongjun e348c77a7a * fix bug #15814 2022-04-26 16:43:38 +08:00
wangyidong 988b796ed5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-26 16:43:28 +08:00
wangyidong 66df7b4990 * code for bug #15377. 2022-04-26 16:43:10 +08:00
hufangzhou 21197a36da * Fix bug #22016. 2022-04-26 16:12:26 +08:00
李玉春 e1d6bf1ef2 Merge branch 'sprint/renying_Fixbug#19044' into 'master'
Fixbug#19044

See merge request easycorp/zentaopms!3137
2022-04-26 08:10:42 +00:00
李玉春 fe221fec43 Merge branch 'bug_21982' into 'master'
Fix bug#21982,21983,21981

See merge request easycorp/zentaopms!3122
2022-04-26 08:09:06 +00:00
王怡栋 ceceb6bc9e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #15834

See merge request easycorp/zentaopms!3119
2022-04-26 07:55:47 +00:00
王怡栋 9f28ff673a Merge branch 'fixbug' into 'master'
*Fix bug #15552.

See merge request easycorp/zentaopms!3128
2022-04-26 07:51:51 +00:00
孙广明 3a7a46e836 Merge branch 'liyuchun_fixbug_15975' into 'master'
* Fix bug #15975.

See merge request easycorp/zentaopms!3126
2022-04-26 07:49:34 +00:00
liyuchun ece5cdbd21 * Adjsut code. 2022-04-26 07:48:53 +00:00
hufangzhou 89a4f83c41 * Fix bug #17203. 2022-04-26 15:45:30 +08:00
renying df378ff26f Fixbug#19044 2022-04-26 07:44:38 +00:00
liyuchun 4c031465dc * Fix bug #22005. 2022-04-26 07:38:12 +00:00
孙广明 f5cf71f41f Merge branch 'fixbugs_zhouxin_2607' into 'master'
* Fix bug #2607.

See merge request easycorp/zentaopms!3132
2022-04-26 07:28:46 +00:00
孙广明 5b5ffb1bff Merge branch 'master_xieqiyu_22002' into 'master'
* Fix bug#22002.

See merge request easycorp/zentaopms!3125
2022-04-26 07:22:30 +00:00
孙广明 a064759431 Merge branch 'master_xieqiyu_2974' into 'master'
* Fix bug#2974.

See merge request easycorp/zentaopms!3118
2022-04-26 07:21:59 +00:00
孙广明 f1551c78d0 Merge branch 'api_zry' into 'master'
* Fix bug when create task and story error.

See merge request easycorp/zentaopms!3134
2022-04-26 07:20:18 +00:00
孙广明 056e9c9fd9 Merge branch 'sprint/scx_feedbackapi' into 'master'
* Feedback api.

See merge request easycorp/zentaopms!3133
2022-04-26 07:18:07 +00:00
zhengrunyu 2633b5c23c * Fix bug when create task and story error. 2022-04-26 15:14:22 +08:00
朱金勇 91e055a713 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3131
2022-04-26 07:09:18 +00:00
朱金勇 6cb9d2ddbe Merge branch 'sprint/fixbug_hufangzhou_15645' into 'master'
* Fix bug #15645.

See merge request easycorp/zentaopms!3129
2022-04-26 07:08:35 +00:00
朱金勇 8aab271c05 Merge branch 'sprint/fixbug_hufangzhou_15954' into 'master'
* Fix bug #15954.

See merge request easycorp/zentaopms!3127
2022-04-26 07:08:21 +00:00
= 2fe95ae659 * Feedback api. 2022-04-26 15:06:22 +08:00
朱金勇 ced683f5f5 Merge branch 'sprint/tianshujie_bug12154' into 'master'
* Fix bug #12154.

See merge request easycorp/zentaopms!3121
2022-04-26 07:04:02 +00:00
zhouxin dc6d0493fb * Fix bug #2607. 2022-04-26 07:02:36 +00:00
= 928149db30 * Feedback api. 2022-04-26 14:50:30 +08:00
zhengrunyu d288ef5b11 * Fix api for stories limit. 2022-04-26 14:45:40 +08:00
zhengrunyu 5e6290cda4 * Fix api for chartdata. 2022-04-26 14:40:32 +08:00
tianshujie ec28d24b8d * Fix bug #13146. 2022-04-26 14:38:09 +08:00
孙广明 e6c8709cd2 Merge branch 'mayue_fix_bug#22004' into 'master'
* Fix bug #22004.

See merge request easycorp/zentaopms!3130
2022-04-26 06:37:58 +00:00
wangyidong 23726bdb49 * adjust code. 2022-04-26 14:36:44 +08:00
mayue 01d59f0d28 * Fix bug #22004. 2022-04-26 06:35:36 +00:00
liyuchun e8b57c9889 * Fix bug #17230. 2022-04-26 06:28:57 +00:00
zenggang 7688d211d3 * Fix bug#21981 2022-04-26 06:21:15 +00:00
hufangzhou 681850b969 * Fix bug #15645. 2022-04-26 14:10:36 +08:00