Commit Graph
45149 Commits
Author SHA1 Message Date
mayue 97aaafbbc3 * Remove ticket from bug. 2022-10-17 09:01:15 +08:00
mayue 3206407fb5 * Remove ticket from story. 2022-10-14 17:11:12 +08:00
mayue c683d09a3f * Add importticket.html. 2022-10-14 14:46:01 +08:00
mayue 811285c53f Merge branch 'biz13_mayue_task#71837' into sprint/zentaobiz12_ticket 2022-10-14 14:45:17 +08:00
mayue fec463deff * Add action lang. 2022-10-14 14:38:23 +08:00
mayue 2ff57dabd6 * Add other lang. 2022-10-14 14:35:19 +08:00
mayue 6b517a3b8e * Finish task #71837. 2022-10-14 14:27:57 +08:00
mayue 25626c1ec7 * Add code for task #71837. 2022-10-13 18:00:22 +08:00
周鑫 575bee545a Merge branch 'ticket_zhouxin_71832' into 'sprint/zentaobiz12_ticket'
* Add sql for ticket.

See merge request easycorp/zentaopms!5746
2022-10-13 06:49:19 +00:00
lanzongjun 477db5f7f2 add table 2022-10-13 14:19:34 +08:00
zhouxin 3f33a5810c * Add sql for ticket. 2022-10-13 12:12:38 +08:00
周鑫 b28d1bfc73 Merge branch 'ticket_zhouxin_fixbugs' into 'sprint/zentaobiz12_ticket'
* Fix bugs of ticket.

See merge request easycorp/zentaopms!5726
2022-10-12 08:41:08 +00:00
zhouxin 9d1b695b20 * Fix bugs of ticket. 2022-10-11 15:40:00 +08:00
lanzongjun 0ca53357c1 showimport mailto init 2022-10-11 14:11:00 +08:00
lanzongjun 06f7d4e611 Merge branch 'sprint/zentaobiz12_ticket' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaobiz12_ticket_lanzongjun 2022-10-11 13:34:06 +08:00
lanzongjun 6fdafa63bb showimport whitelist 2022-10-11 13:28:24 +08:00
周鑫 a71d6cc5d0 Merge branch 'ticket_zhouxin_fixbugs' into 'sprint/zentaobiz12_ticket'
* Fix bugs.

See merge request easycorp/zentaopms!5719
2022-10-11 03:47:37 +00:00
zhouxin c25d5827dc * Fix bugs. 2022-10-11 11:32:45 +08:00
周鑫 161b5223b4 Merge branch 'ticket_zhouxin_71836' into 'sprint/zentaobiz12_ticket'
* Finish task #71836.

See merge request easycorp/zentaopms!5709
2022-10-10 07:31:30 +00:00
zhouxin 0cfb69ac5b * Finish task #71836. 2022-10-10 15:23:22 +08:00
lanzongjun f9f49755c1 add sql 2022-10-08 17:04:23 +08:00
lanzongjun 4f79024d88 add sql 2022-10-08 16:47:33 +08:00
lanzongjun 7845fd0aca add sql 2022-10-08 16:35:58 +08:00
lanzongjun 949d430fd4 add sql 2022-10-08 09:30:19 +08:00
lanzongjun 2a7b35764f * modify db 2022-09-30 10:16:57 +08:00
lanzongjun 398bc004e2 modify sql 2022-09-29 14:00:32 +08:00
lanzongjun ce85f43b5b Merge branch 'sprint/zentaobiz12_ticket' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaobiz12_ticket_lanzongjun 2022-09-29 13:57:03 +08:00
孙广明 f5a44f2cec Merge branch 'biz12_mayue_task#70890' into 'sprint/zentaobiz12_ticket'
* Fix bug of feedback to bug.

See merge request easycorp/zentaopms!5611
2022-09-29 05:30:59 +00:00
mayue 23c42a2439 * Fix bug of feedback to bug. 2022-09-29 13:25:10 +08:00
lanzongjun f7b1163f39 modify db 2022-09-28 15:32:34 +08:00
lanzongjun 1264f361ee * add database 2022-09-26 16:50:38 +08:00
lanzongjun ba9c9552b0 * add database 2022-09-26 13:56:57 +08:00
李玉春 8e1b4f7819 Merge branch 'sprint/wangzemei/green_flower' into 'master'
* add green theme flower

See merge request easycorp/zentaopms!5540
2022-09-26 03:24:10 +00:00
wangzemei 8596c89ebe * add green theme flower 2022-09-26 11:20:40 +08:00
李玉春 eb56ce4fbc Merge branch 'sprint/241_tianshujie_bug' into 'master'
Sprint/241 tianshujie bug

See merge request easycorp/zentaopms!5526
2022-09-26 00:57:39 +00:00
李玉春 6ec4879cd9 Merge branch 'sprint/241_wangzemei_fix' into 'master'
* fix style

See merge request easycorp/zentaopms!5536
2022-09-26 00:50:30 +00:00
wangzemei 483a8e4c96 * fix style 2022-09-26 08:45:23 +08:00
王怡栋 a728c2e90c Merge branch 'fixbug' into 'master'
* Fix bug #27891,27610.

See merge request easycorp/zentaopms!5535
2022-09-26 00:38:39 +00:00
tanghucheng 142da875c3 * Fix bug #27891,27610. 2022-09-26 08:36:57 +08:00
李玉春 080972f771 Merge branch 'sprint/241_wangzemei_27863' into 'master'
* modify style about green

See merge request easycorp/zentaopms!5534
2022-09-26 00:29:36 +00:00
wangzemei 13d7e26a87 * modify style about green 2022-09-26 08:26:19 +08:00
tianshujie 3a9b2c4952 * Modify the SQL. 2022-09-26 08:12:53 +08:00
tianshujie e82f1f6d6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug 2022-09-26 08:12:31 +08:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
王怡栋 7cbc6a53f0 Merge branch 'sprint/241_dyl_70025' into 'master'
Sprint/241 dyl 70025

See merge request easycorp/zentaopms!5531
2022-09-23 09:19:03 +00:00
王怡栋 f07e15a4b4 Merge branch 'master_xieqiyu_27359' into 'master'
* Fix bug#27359.

See merge request easycorp/zentaopms!5530
2022-09-23 09:18:16 +00:00
王怡栋 98690f8a58 Merge branch 'master_xieqiyu_27404' into 'master'
* Fix bug#27404.

See merge request easycorp/zentaopms!5529
2022-09-23 09:17:41 +00:00
xieqiyu eed9d18857 * Fix bug#27359. 2022-09-23 09:02:39 +00:00
xieqiyu 9914478a58 * Fix bug#27404. 2022-09-23 08:54:58 +00:00
王怡栋 ccee584e98 Merge branch 'master_xieqiyu_27408' into 'master'
* Fix bug#27408.

See merge request easycorp/zentaopms!5528
2022-09-23 08:54:46 +00:00