Commit Graph
2961 Commits
Author SHA1 Message Date
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
王怡栋 1a82574947 Merge branch 'sprint/master_zhouxudong_22964' into 'master'
Sprint/master zhouxudong 22964

See merge request easycorp/zentaopms!4315
2022-07-04 06:56:52 +00:00
wangyidong c88aa6b8f1 Merge branch 'zentaomax35' 2022-07-04 14:16:06 +08:00
zhouxudong 2b644837a0 * Fix bug #23596. 2022-07-04 00:30:07 +00:00
zhouxudong c568a46744 * Fix bug #22964. 2022-07-01 07:20:01 +00:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
lanzongjun 8bc8979c20 * fix bug #24071 2022-07-01 10:59:06 +08:00
mayue ead619d5e3 * Fix bug #24656. 2022-07-01 10:14:04 +08:00
mayue 828d476956 * Fix bug #24643. 2022-07-01 08:23:08 +08:00
王怡栋 531a112d7d Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
2022-06-30 05:17:58 +00:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
王怡栋 48bf110630 Merge branch 'master_xieqiyu_24275' into 'master'
* Fix bug#24275.

See merge request easycorp/zentaopms!4244
2022-06-30 02:55:36 +00:00
xieqiyu d641d96641 * Fix bug#24275. 2022-06-30 09:44:43 +08:00
mayue 4298ec0f98 * Adjust some show issue. 2022-06-30 09:35:55 +08:00
lanzongjun 66ea6430cf * fix bug #24382 2022-06-30 08:52:59 +08:00
lanzongjun 694410817a * fix bug #24382 2022-06-30 08:50:31 +08:00
王怡栋 4fa8895df3 Merge branch 'sprint/210_mayue_task#58767' into 'master'
Sprint/210 mayue task#58767

See merge request easycorp/zentaopms!4228
2022-06-29 09:12:50 +00:00
mayue 7db71208f0 * Optimize code. 2022-06-29 17:09:07 +08:00
mayue 5feb83eef7 * Optimize code. 2022-06-29 16:54:27 +08:00
mayue 02b6efaee0 * Optimize code. 2022-06-29 16:53:05 +08:00
mayue 9802debcad * Optimize code. 2022-06-29 16:51:06 +08:00
mayue 6289859fb2 * Finish task #58767. 2022-06-29 16:40:57 +08:00
xieqiyu 36d6687438 * Fix bug#24394. 2022-06-29 14:18:35 +08:00
mayue b33c652953 * Add some code. 2022-06-28 16:01:28 +08:00
孙广明 0c1c8ab16d Merge branch 'sprint/210_mayue_bug#24408' into 'master'
* Fix bug #24408.

See merge request easycorp/zentaopms!4172
2022-06-28 05:04:23 +00:00
mayue c860a20edf * Fix bug #24408. 2022-06-28 10:15:36 +08:00
xieqiyu b55f45be0f * Finish task#58592. 2022-06-28 09:49:22 +08:00
xieqiyu 132433cc92 * Modify language item. 2022-06-27 17:27:15 +08:00
xieqiyu 9b1c865964 * Code for task#57854. 2022-06-27 17:11:59 +08:00
xieqiyu 8dd618528a * Fix test bug. 2022-06-27 16:51:53 +08:00
xieqiyu 08faa3edff * Finish task#57854. 2022-06-27 13:33:11 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
孙广明 a6ec47142f Merge branch 'sprint/207_mayue_bug#24062' into 'master'
* Fix bug #24062.

See merge request easycorp/zentaopms!4108
2022-06-23 07:01:47 +00:00
mayue c15bda57a8 * Fix bug #24062. 2022-06-23 14:58:39 +08:00
孙广明 6d88c0c22b * Code for code error. 2022-06-23 14:16:01 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
mayue a0fd431401 * Optimize code. 2022-06-21 15:23:12 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
孙广明 3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
xieqiyu 783d4471b0 * Fix bug#23797. 2022-06-16 15:50:25 +08:00
孙广明 3a1d6a8982 Merge branch 'fixbug_23694' into 'master'
fixbug_23694

See merge request easycorp/zentaopms!3971
2022-06-16 06:36:28 +00:00
sunjun e2e1bddf96 fixbug_23694 2022-06-16 05:17:24 +00:00
leiyong fcd6f4c333 * Finish task#56932. 2022-06-15 10:57:05 +00:00
leiyong b6f5c18dc9 * Finish task#56933. 2022-06-14 07:56:43 +00:00
xieqiyu c7919c48d0 * Fix bug#23597. 2022-06-13 13:17:25 +08:00