Commit Graph
38027 Commits
Author SHA1 Message Date
王怡栋 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
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
hufangzhou 681850b969 * Fix bug #15645. 2022-04-26 14:10:36 +08:00
wangyidong d8939cd2de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-26 13:55:15 +08:00
wangyidong 47b07058f1 * code for bug #15453. 2022-04-26 13:54:55 +08:00
tanghucheng e00d70491b * Fix bug . 2022-04-26 13:47:34 +08:00
tanghucheng 0fd5968a14 * Fix bug #15552,15559. 2022-04-26 13:46:45 +08:00
hufangzhou 6a42dabd32 * Fix bug #15954. 2022-04-26 13:44:14 +08:00
liyuchun e2501b26ea * Fix bug #15975. 2022-04-26 05:12:29 +00:00
孙广明 41f5a6bf2e Merge branch 'mayue_fix_bug#21980' into 'master'
* Fix bug #21980.

See merge request easycorp/zentaopms!3124
2022-04-26 05:06:22 +00:00
王怡栋 6ba9bfee42 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #10735.

See merge request easycorp/zentaopms!3120
2022-04-26 03:31:21 +00:00
孙广明 f981ec6a3a Merge branch 'fixbug' into 'master'
* Fix bug #18209.

See merge request easycorp/zentaopms!3123
2022-04-26 03:29:32 +00:00
朱金勇 e3b3bba0ea Merge branch 'sprint/fixbug_hufangzhou_15655' into 'master'
* Fix bug #15655.

See merge request easycorp/zentaopms!3117
2022-04-26 03:29:19 +00:00
tanghucheng 60bdd927d1 * Fix bug #18209. 2022-04-26 11:26:03 +08:00
mayue eebfc3c70f * Fix bug #21980. 2022-04-26 03:23:02 +00:00
xieqiyu 3c4b41ea3a * Fix bug#22002. 2022-04-26 11:16:20 +08:00
tianshujie f5d69d5c30 * Fix bug #12154. 2022-04-26 11:14:54 +08:00
李玉春 2aa57d045b Merge branch 'cyy_bug' into 'master'
* Fix unlink file error.

See merge request easycorp/zentaopms!3115
2022-04-26 03:11:42 +00:00
lanzongjun 68270a031b * fix bug #15834 2022-04-26 10:50:44 +08:00
xieqiyu 530ee14eb2 * Fix bug#2974. 2022-04-26 10:44:56 +08:00
孙广明 8a70ffb277 * Fix bug #10735. 2022-04-26 10:38:31 +08:00
hufangzhou 2048dfa232 * Fix bug #15655. 2022-04-26 10:36:33 +08:00
tanghucheng 44fe7084c0 * Fix bug #10877. 2022-04-26 10:35:50 +08:00
wangyidong 5acdc8964c * fix bug #22001. 2022-04-26 10:14:04 +08:00
wangyidong 27e377d1fb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-26 09:52:04 +08:00
wangyidong f4e295ac8e * adjust for sso. 2022-04-26 09:51:55 +08:00
wangyidong f77b7875cc * adjust for kilin. 2022-04-26 09:46:33 +08:00