Commit Graph
46291 Commits
Author SHA1 Message Date
liuyongkai 738b1d8d57 * Resovle feedback #1334. 2022-11-02 02:25:46 +00:00
朱金勇 03737c95f4 Merge branch 'sprint/fix-install' into 'master'
* Fix install and upgrade locate error.

See merge request easycorp/zentaopms!5976
2022-11-02 00:18:57 +00:00
Lufei 3970bc226d * Fix install and upgrade locate error. 2022-11-01 19:22:40 +08:00
朱金勇 ca778ca1d5 Merge branch 'sprint/fix-install' into 'master'
* Fix install error.

See merge request easycorp/zentaopms!5973
2022-11-01 08:15:15 +00:00
孙广明 589187146e Merge branch 'feedback_lyk_1318' into 'master'
* Resolve feedback #1318.

See merge request easycorp/zentaopms!5972
2022-11-01 07:59:08 +00:00
liuyongkai 2dd466f1fe * Resolve feedback #1318. 2022-11-01 07:57:50 +00:00
liuyongkai 431db60769 * Resolve feedback #1318. 2022-11-01 07:53:39 +00:00
Lufei ac363b3df7 * Fix install error. 2022-11-01 15:44:49 +08:00
liuyongkai 3c0c0c3c73 * Resolve feedback #1318. 2022-11-01 07:43:35 +00:00
liuyongkai 9685f4b186 * Resolve feedback #1318. 2022-11-01 07:31:11 +00:00
李玉春 314f82091d Merge branch 'cyy_project' into 'master'
* Modify project icon.

See merge request easycorp/zentaopms!5960
2022-11-01 07:09:55 +00:00
李玉春 3f00e3ef70 Merge branch 'sprint/254_tianshujie_fixbug' into 'master'
Sprint/254 tianshujie fixbug

See merge request easycorp/zentaopms!5969
2022-11-01 07:09:24 +00:00
王怡栋 90e5ea69f5 Merge branch 'ticket_zhouxin_fixdb' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5970
2022-11-01 07:06:09 +00:00
zhouxin 8159742756 * Fix bug. 2022-11-01 15:04:29 +08:00
caoyanyi e6559ea155 * Fix bug #28181. 2022-11-01 14:35:02 +08:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
tianshujie 4ea862f2ee * Fix bug #28222. 2022-11-01 14:20:20 +08:00
tianshujie 2879079ec6 * Fix bug #29113. 2022-11-01 14:11:48 +08:00
李玉春 b4fbb4f928 Merge branch 'sprint/wangzemei/themeblue' into 'master'
* Solve unpacked problems

See merge request easycorp/zentaopms!5965
2022-11-01 05:55:49 +00:00
wangzemei 735633530d * Solve unpacked problems 2022-11-01 13:47:58 +08:00
王怡栋 707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
王怡栋 afd87a2364 Merge branch 'sprint/hufangzhou_feedback_1304' into 'master'
* Handle feedback #1304.

See merge request easycorp/zentaopms!5957
2022-11-01 05:32:32 +00:00
王怡栋 b7247e2652 Merge branch 'master_feedback_1267' into 'master'
* Resolved feedback #1267.

See merge request easycorp/zentaopms!5955
2022-11-01 05:31:51 +00:00
王怡栋 11fa395ed1 Merge branch 'master_feedback_1049' into 'master'
Master feedback 1049

See merge request easycorp/zentaopms!5944
2022-11-01 05:31:20 +00:00
孙广明 dc4ef54ab8 Merge branch 'sprint/254_tianshujie_fixbug' into 'master'
Sprint/254 tianshujie fixbug

See merge request easycorp/zentaopms!5959
2022-11-01 00:30:23 +00:00
liuhong fe056715f5 * Adjust code for bug #26228. 2022-10-31 10:03:23 +00:00
liuhong 5c1b236833 * Adjust code #1049. 2022-10-31 09:56:23 +00:00
tianshujie 438bd7cb8c * Delete useless code. 2022-10-31 17:13:54 +08:00
caoyanyi f54b412c3b * Modify project icon. 2022-10-31 17:11:39 +08:00
tianshujie 5543d1ec40 * Finish task #74082. 2022-10-31 17:09:59 +08:00
tianshujie e56e4acd07 * Remove useless code. 2022-10-31 16:59:58 +08:00
tianshujie c51a1b9233 * Finish task #74082. 2022-10-31 16:58:31 +08:00
朱金勇 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
tianshujie 2ca6c0cc0c * Fix bug #28050. 2022-10-31 16:19:17 +08:00
tianshujie c79a78afe4 * Fix bug #28222. 2022-10-31 15:43:28 +08:00
hufangzhou 402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00: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
liuhong 1da094b1a0 * Resolved feedback #1267. 2022-10-31 07:25:25 +00:00
tianshujie 11f969dc9f * Finish task #74082. 2022-10-31 15:24:22 +08:00
liuhong f9e5e9858a * Adjust code #1049 for story export. 2022-10-31 07:00:40 +00: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