Commit Graph
46251 Commits
Author SHA1 Message Date
朱金勇 d5178b9fb8 Merge branch 'sprint/fix-api' into 'master'
* Fix loadModel for entry.

See merge request easycorp/zentaopms!5958
2022-10-31 08:48:51 +00:00
Lufei 031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
李玉春 e138317cf0 Merge branch 'sprint/253_wangzemei_fix' into 'master'
* fix bug 28973 28915 28967

See merge request easycorp/zentaopms!5956
2022-10-31 07:28:16 +00:00
wangzemei f322be0e8c * fix bug 28973 28915 28967 2022-10-31 15:25:35 +08:00
孙广明 ff132b7deb Merge branch 'sprint/zentaobiz16' into 'master'
* Code for task#73360,#73366,#73363.

See merge request easycorp/zentaopms!5952
2022-10-31 06:26:51 +00:00
王怡栋 afba980ce4 Merge branch 'bug_29103' into 'master'
* Fix bug #29103

See merge request easycorp/zentaopms!5946
2022-10-31 06:02:16 +00:00
王怡栋 d485d929b1 Merge branch 'master_feedback_1301' into 'master'
* Resolved feedback #1301.

See merge request easycorp/zentaopms!5945
2022-10-31 06:01:52 +00:00
王怡栋 9b02395845 Merge branch 'master_bug_26228' into 'master'
* Fix bug #26228.

See merge request easycorp/zentaopms!5943
2022-10-31 05:58:26 +00:00
王怡栋 f65c403dc0 Merge branch 'master_xieqiyu_29013' into 'master'
* Fix bug#29013.

See merge request easycorp/zentaopms!5942
2022-10-31 05:56:24 +00:00
王怡栋 37433b6635 Merge branch 'bug_29089' into 'master'
* Fix bug #29089

See merge request easycorp/zentaopms!5940
2022-10-31 05:42:48 +00:00
王怡栋 2da92b6423 Merge branch 'feedback_zhouxin_36186' into 'master'
* Resolve feedback #197.

See merge request easycorp/zentaopms!5950
2022-10-31 05:42:00 +00:00
zhouxin cd5415309e * Resolve feedback #36186. 2022-10-31 13:21:00 +08:00
李玉春 fa39994e50 Merge branch 'cyy_bug' into 'master'
* Modify pri style.

See merge request easycorp/zentaopms!5936
2022-10-31 05:15:57 +00:00
zenggang 1af29a6aa6 * Fix bug #29103 2022-10-31 02:18:56 +00:00
liuhong 67ce1a86eb * Resolved feedback #1301. 2022-10-31 01:49:23 +00:00
liuhong 0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
xieqiyu f7a84e569b * Fix bug#29013. 2022-10-29 05:47:34 +00:00
caoyanyi 7e3fa55506 * Adjust code. 2022-10-28 17:17:50 +08:00
李玉春 0d7e25c83d Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5938
2022-10-28 09:11:40 +00:00
zenggang a4a217c64d * Fix bug #29089 2022-10-28 08:34:37 +00:00
朱金勇 9a301cff93 Merge branch 'sprint/fix-checkPriv' into 'master'
* Fix bug of unauthorized users.

See merge request easycorp/zentaopms!5932
2022-10-28 08:16:51 +00:00
鲁飞 b1cb5a798e * Fix bug of unauthorized users. 2022-10-28 08:16:50 +00:00
tianshujie 2bf41732ef * Fix bug #29000. 2022-10-28 16:08:40 +08:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
tianshujie 278c4779f6 * Modify the list of issues in the block to be processed. 2022-10-28 15:59:17 +08:00
caoyanyi b81056c6ea * Modify pri style. 2022-10-28 15:58:06 +08:00
孙广明 8389191e25 Merge branch 'sprint/253_tianshujie_73746' into 'master'
* Fix bug #29035.

See merge request easycorp/zentaopms!5934
2022-10-28 07:39:11 +00:00
tianshujie fb546c1176 * Fix bug #29035. 2022-10-28 15:17:08 +08:00
王怡栋 f03d771f33 Merge branch 'master_bug_28882' into 'master'
* Fix bug #28882.

See merge request easycorp/zentaopms!5929
2022-10-28 03:28:35 +00:00
王怡栋 85d92fa65b Merge branch 'master_bug_28884' into 'master'
* Fix bug #28884.

See merge request easycorp/zentaopms!5928
2022-10-28 03:28:05 +00:00
王怡栋 af1c82ddb1 Merge branch 'master_bug_28949' into 'master'
*Fix bug #28949.

See merge request easycorp/zentaopms!5925
2022-10-28 03:27:38 +00:00
李玉春 26559522bb Merge branch 'cyy_bug' into 'master'
* Modify kanban severity style.

See merge request easycorp/zentaopms!5930
2022-10-28 03:15:37 +00:00
李玉春 e5ddf25385 Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5927
2022-10-28 03:15:24 +00:00
caoyanyi a6cdf94502 * Modify kanban severity style. 2022-10-28 11:00:42 +08:00
liuhong 67f6c5c346 * Fix bug #28882. 2022-10-28 02:51:28 +00:00
tianshujie 73dd27e207 * Delete unnecessary Spaces. 2022-10-28 10:46:21 +08:00
李玉春 773171f523 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!5924
2022-10-28 02:43:33 +00:00
caoyanyi 7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
liuhong db86c8456d * Fix bug #28884. 2022-10-28 02:33:59 +00:00
tianshujie c3dd9a3bf2 * Fix bug #29004. 2022-10-28 10:24:53 +08:00
caoyanyi 284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +08:00
tianshujie 8f10f11926 * Fix bug #29077. 2022-10-28 10:09:57 +08:00
tianshujie 1b575f2024 * Fix bug #29081. 2022-10-28 09:56:54 +08:00
tianshujie 8ea082d11c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_fixbug 2022-10-28 09:53:45 +08:00
tianshujie 5031451ce8 * Fix bug #29000. 2022-10-28 09:53:28 +08:00
caoyanyi 542ca7e7f0 * Fix bug #29079. 2022-10-28 09:48:29 +08:00
liuhong 8878cbf8b7 *Fix bug #28949. 2022-10-28 01:48:01 +00:00
wangyidong 11e0ad5c0b * adjust for ztsession. 2022-10-28 09:38:40 +08:00
tianshujie c96621c63a * Fix bug #29015. 2022-10-28 09:37:22 +08:00
caoyanyi 5a94270911 * Modify pri style. 2022-10-28 09:33:14 +08:00