Commit Graph
33880 Commits
Author SHA1 Message Date
王怡栋 91ec091aa4 Merge branch 'sgm_fixbug' into 'zentaopms_207'
* Fix bug for release pager.

See merge request easycorp/zentaopms!4046
2022-06-21 09:33:35 +00:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
孙广明 3b7746915f * Fix bug for release pager. 2022-06-21 17:16:24 +08:00
wangzemei 0f30bd5fd9 * Fix bug #23265 2022-06-21 09:11:46 +00:00
tianshujie 226a7fc69b * Finish task #57893. 2022-06-21 16:37:35 +08:00
王怡栋 9f25b9cbb3 Merge branch 'sgm_fixbug' into 'zentaopms_207'
* Code for bug #24007.

See merge request easycorp/zentaopms!4044
2022-06-21 08:22:37 +00:00
孙广明 dab3b7eab2 Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.

See merge request easycorp/zentaopms!4037
2022-06-21 07:24:12 +00:00
mayue a0fd431401 * Optimize code. 2022-06-21 15:23:12 +08:00
孙广明 5f26b603e7 * Code for bug #24007. 2022-06-21 15:22:12 +08:00
tianshujie f6f4bc5f7c * Finish task #57894. 2022-06-21 15:13:21 +08:00
tianshujie a6db8b4999 * Fix bug #24005. 2022-06-21 14:54:17 +08:00
wangyidong 541f9dd0d1 * code for bug #58034. 2022-06-21 14:53:45 +08:00
孙广明 636cda107c Merge branch 'sprint207_57903' into 'zentaopms_207'
* Finish task#57903

See merge request easycorp/zentaopms!4029
2022-06-21 06:49:11 +00:00
孙广明 c41b4f6e69 Merge branch 'sprint205_leiyong_task_57901' into 'sprint/205'
Sprint205 leiyong task 57901

See merge request easycorp/zentaopms!4032
2022-06-21 06:45:17 +00:00
孙广明 b0a9a2d7f0 Merge branch 'sprint/207_zg_57907' into 'zentaopms_207'
* Finish task #57907,57909

See merge request easycorp/zentaopms!4035
2022-06-21 06:44:58 +00:00
王怡栋 4a09c0e82c Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.

See merge request easycorp/zentaopms!4034

(cherry picked from commit 7009548c68)

f5ff0975 * Finish task #57904.
2022-06-21 06:28:33 +00:00
王怡栋 83ecf656d3 Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.

See merge request easycorp/zentaopms!4033

(cherry picked from commit beaddb012c)

f0c23584 * Code for feedback #397.
2022-06-21 06:28:13 +00:00
王怡栋 c30ba304ab Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
2022-06-21 06:25:45 +00:00
王怡栋 319eda5854 Revert "Merge branch 'sgm_fixbug' into 'master'"
This reverts merge request !4034
2022-06-21 06:25:08 +00:00
王怡栋 7009548c68 Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.

See merge request easycorp/zentaopms!4034
2022-06-21 06:09:37 +00:00
wangzemei b11a919ccd * Fix bug #24000 2022-06-21 06:08:36 +00:00
tianshujie 42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
王怡栋 dba55ec299 Merge branch 'sprint/205_zhouxudong_57872' into 'sprint/205'
Sprint/205 zhouxudong 57872

See merge request easycorp/zentaopms!4040
2022-06-21 06:04:16 +00:00
王怡栋 a3bb60c87d Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'
Sprint/master zhouxudong 57871

See merge request easycorp/zentaopms!4024
2022-06-21 06:03:28 +00:00
zhouxudong d8ba49e688 * Finisha task #57872. 2022-06-21 06:01:59 +00:00
tianshujie aab46a8414 * Finish task #57894. 2022-06-21 13:55:06 +08:00
zhouxudong 4dd1445e8b * Finish task #57872. 2022-06-21 05:48:57 +00:00
tianshujie 367f96a886 * Finish task #57894. 2022-06-21 13:47:08 +08:00
liyuchun 6076785841 * Show default branch. 2022-06-21 05:37:24 +00:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
tianshujie b812104494 * Finish task #57894. 2022-06-21 13:14:06 +08:00
zenggang fae27b266a * Finish task #57909 2022-06-21 03:26:37 +00:00
tianshujie 9585c4f031 * Finish task #57894. 2022-06-21 11:26:07 +08:00
liyuchun 76c813efc9 * Finish task #57657. 2022-06-21 03:25:51 +00:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
caoyanyi 4bd3805ae9 * Add css file. 2022-06-21 11:05:31 +08:00
zenggang b761aa029b * Finish task #57907 2022-06-21 02:50:55 +00:00
孙广明 f5ff0975f8 * Finish task #57904. 2022-06-21 10:50:21 +08:00
caoyanyi dfbf69a211 * Finish task #57664. 2022-06-21 10:33:12 +08:00
孙广明 f0c23584e0 * Code for feedback #397. 2022-06-21 10:23:58 +08:00
leiyong b0645c9cdd * Adjust CSS. 2022-06-21 02:13:42 +00:00
tanghucheng 98d4d45079 * Add menuorder for custom setting. 2022-06-21 10:10:25 +08:00
guofeilong bb893c33fb * Fix bug #23659 2022-06-21 01:47:28 +00:00
zhouxudong f8792b01bf * Finish task #57871. 2022-06-21 00:42:05 +00:00
leiyong 725f37fcd0 * Finish task#57868. 2022-06-20 09:55:19 +00:00
leiyong bb125909dc Finish task#57864. 2022-06-20 09:44:25 +00:00
zenggang dff6937dc4 * Adjust code 2022-06-20 09:29:29 +00:00
zenggang 2564d2d60b * Finish task#57903 2022-06-20 09:27:56 +00:00
tianshujie 69df74b3c5 * Finish task #57895. 2022-06-20 17:11:02 +08:00