Commit Graph
44203 Commits
Author SHA1 Message Date
孙广明 7b4002c1d1 Merge branch 'sprint/max43_mayue_bug#26200' into 'master'
* Fix bug #26200.

See merge request easycorp/zentaopms!5058
2022-08-23 03:02:25 +00:00
mayue 6336e232fb * Optimize code. 2022-08-23 11:01:31 +08:00
xieqiyu bd510fe0d4 * Fix bug of update story datetable. 2022-08-23 10:11:31 +08:00
王怡栋 b1516dbc92 Merge branch 'importExport' into 'master'
* Fix bug #65908.

See merge request easycorp/zentaopms!5063
2022-08-23 01:58:31 +00:00
王怡栋 23c4b63452 Merge branch 'sprint/max43_mayue_bug#26054#26057' into 'master'
* Fix bug #26054#26057.

See merge request easycorp/zentaopms!5062
2022-08-23 01:57:51 +00:00
王怡栋 5c3a2b5ddc Merge branch 'sprint/hufangzhou_26743' into 'master'
* Fix bug #26743. And modify the unit case of batch edit under the execution module.

See merge request easycorp/zentaopms!5056
2022-08-23 01:55:40 +00:00
王怡栋 115d740063 Merge branch 'master_liuhong_64879' into 'master'
0timization task #64879.

See merge request easycorp/zentaopms!5055
2022-08-23 01:55:13 +00:00
王怡栋 c259250003 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #65923

See merge request easycorp/zentaopms!5054
2022-08-23 01:54:36 +00:00
王怡栋 216d310dd1 Merge branch 'release_zg_fix' into 'master'
* Fix release email bug

See merge request easycorp/zentaopms!5048
2022-08-23 01:52:45 +00:00
王怡栋 b688c564f5 Merge branch 'sprint/master_zhouxudong_66231' into 'master'
* Finish task #66231.

See merge request easycorp/zentaopms!5061
2022-08-23 01:50:26 +00:00
王怡栋 2a49655e2d Merge branch 'sprint/master_zhouxudong_update64888' into 'master'
* Optimization task #64888.

See merge request easycorp/zentaopms!5037
2022-08-23 01:49:31 +00:00
mayue 2f2f0e6542 * Optimize code. 2022-08-23 09:33:45 +08:00
tanghucheng b9d031bda1 * Fix bug #65908. 2022-08-23 09:27:56 +08:00
mayue bf9a6e4da8 * Fix bug #26054#26057. 2022-08-23 09:07:45 +08:00
lanzongjun 1027078838 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-08-23 08:48:08 +08:00
sunguangming 7fe8456f4f * Code for build locate bug. 2022-08-23 08:33:17 +08:00
孙广明 dff37692d9 Merge branch 'sprint/231_liumengyi_65780' into 'master'
* Finish task #65780.

See merge request easycorp/zentaopms!5057
2022-08-23 00:12:26 +00:00
孙广明 c9ae2bfcb6 Merge branch 'master_xieqiyu_draftStory' into 'master'
Master xieqiyu draft story

See merge request easycorp/zentaopms!5060
2022-08-23 00:11:31 +00:00
dongli cedf77727b * Finish task #64972,64973. 2022-08-22 13:03:04 +00:00
xieqiyu 40771942f7 Merge remote-tracking branch 'origin' into master_xieqiyu_draftStory 2022-08-22 17:47:50 +08:00
xieqiyu 64b9c8d35e * Delete unused code. 2022-08-22 17:41:29 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
孙广明 eda772428a Merge branch 'sprint/max43_mayue_bug#26638' into 'master'
Sprint/max43 mayue bug#26638

See merge request easycorp/zentaopms!5051
2022-08-22 09:11:01 +00:00
wangyidong 1897a831dd * fix for php8.1 2022-08-22 17:00:23 +08:00
xieqiyu a1212a5a8b * * Add upgrade sql and the function of updateStoryStatus. 2022-08-22 16:43:36 +08:00
hufangzhou 33324f758f * Fix bug #26743. 2022-08-22 16:32:48 +08:00
mayue b9ac60f75f * Fix bug #26200. 2022-08-22 16:26:16 +08:00
李玉春 a31e96170b Merge branch 'sprint/231_tianshujie_65781' into 'master'
Sprint/231 tianshujie 65781

See merge request easycorp/zentaopms!5052
2022-08-22 08:17:49 +00:00
tianshujie 33eb51b9d1 * Finish task #65781. 2022-08-22 16:16:54 +08:00
tianshujie 59000f958f * Finish task #65781. 2022-08-22 16:14:00 +08:00
liumengyi 1d00010f72 * Modify css for task #65780. 2022-08-22 16:13:51 +08:00
hufangzhou c34766a68d * Fix bug #26743. And modify the unit case of batch edit under the execution module. 2022-08-22 16:09:39 +08:00
zhouxudong cc6d27636f * Finish task #66231. 2022-08-22 08:06:41 +00:00
liuhong 148fa1f91f 0timization task #64879. 2022-08-22 08:05:25 +00:00
lanzongjun f5395d3cdb * finish task #65923 2022-08-22 15:58:47 +08:00
孙广明 1ff75bb2af Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug for no execution view.

See merge request easycorp/zentaopms!5053
2022-08-22 07:57:51 +00:00
liumengyi 66532261dd * Fix bug for no execution view. 2022-08-22 15:54:42 +08:00
tianshujie eb35e54251 * Finish task #65781. 2022-08-22 15:48:13 +08:00
tianshujie 2cbee1b76c * Finish task #65781. 2022-08-22 15:38:09 +08:00
tianshujie eac40c40ca * Finish task #65781. 2022-08-22 15:33:06 +08:00
王怡栋 fbc06ff2e3 Merge branch 'master_liuhong_26203' into 'master'
* Fix bug#26203.

See merge request easycorp/zentaopms!5046
2022-08-22 07:24:08 +00:00
王怡栋 295c4bf8b7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #65930

See merge request easycorp/zentaopms!5043
2022-08-22 07:23:29 +00:00
王怡栋 9189bce779 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug for task #64967.

See merge request easycorp/zentaopms!5050
2022-08-22 07:23:06 +00:00
mayue 93c0360d42 * Add other language. 2022-08-22 14:50:33 +08:00
liumengyi a54d9168bb * Fix bug for task #64967. 2022-08-22 14:49:04 +08:00
tianshujie d8a419798d * Fix bug #26728. 2022-08-22 14:47:40 +08:00
mayue 90068c5a8f * Fix bug #26638. 2022-08-22 14:45:51 +08:00
liumengyi 67151d4595 * Fix bug for task #64967. 2022-08-22 14:43:18 +08:00
xieqiyu f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
liuhong 4d20bd7bf4 *Fix bug #26725. 2022-08-22 06:31:23 +00:00