Commit Graph
28785 Commits
Author SHA1 Message Date
zhengrunyu db4ee8bbf8 *Finish task #44163. 2021-11-11 09:54:10 +08:00
李玉春 0d9fa0869a Merge branch 'sprint/170_songchenxuan_15665' into 'sprint/170'
* Fix bug #15665

See merge request easycorp/zentaopms!364
2021-11-09 07:09:57 +00:00
root f49cbba01d * Fix bug #15665 2021-11-09 14:38:14 +08:00
李玉春 d75156dd74 Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.

See merge request easycorp/zentaopms!361
2021-11-09 06:00:23 +00:00
root 397fb3e152 Finish task #43918. 2021-11-09 13:58:39 +08:00
孙广明 90ca341898 Merge branch 'sprint/170_zhengrunyu_44157' into 'sprint/170'
*Finish task #44157.

See merge request easycorp/zentaopms!362
2021-11-09 05:58:09 +00:00
zhengrunyu 411d2429ee Finish task #44157. 2021-11-09 13:55:56 +08:00
zhengrunyu 928784c9a9 Finish task #44157. 2021-11-09 13:52:13 +08:00
zhengrunyu 0f975ee3c4 *Finish task #44157. 2021-11-09 13:48:06 +08:00
root 782d1114bf Finish task #43918. 2021-11-09 13:47:30 +08:00
zhengrunyu 57bc70b75b *Finish task #44157. 2021-11-09 13:31:05 +08:00
root 44c44f11d1 Finish task #43918. 2021-11-09 13:25:52 +08:00
root f23ff798b9 Finish task #43918. 2021-11-09 13:23:37 +08:00
root 627ba8e493 Finish task #43918. 2021-11-09 13:18:44 +08:00
root 8c731d67fe Finish task #43918. 2021-11-09 13:14:05 +08:00
root fdc54380ee * Finish task #43918. 2021-11-09 13:08:58 +08:00
root c0169fd823 * Finish task #43918. 2021-11-09 11:27:30 +08:00
root ab5ee93bc3 * Finish task #43918. 2021-11-09 11:26:25 +08:00
孙广明 9d135336e8 Merge branch 'sprint/170_hufangzhou_43891' into 'sprint/170'
* Code for task #43891.

See merge request easycorp/zentaopms!360
2021-11-09 03:15:37 +00:00
hufangzhou 9c7884d905 * Code for task #43891. 2021-11-09 11:09:48 +08:00
root 67635b0317 * Finish task #43918. 2021-11-09 10:39:02 +08:00
root c55a455a16 * Finish task #43918. 2021-11-09 10:37:48 +08:00
root 33539633d7 * Finish task #43918. 2021-11-09 10:35:17 +08:00
李玉春 b9bdc8a517 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!356
2021-11-09 01:49:16 +00:00
mayue cafb5d08a8 * Fix bug #15688. 2021-11-09 09:47:10 +08:00
mayue 6c23d4a336 * Fix bug #15688. 2021-11-09 09:37:33 +08:00
李玉春 7edc712958 Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170'
* Fix a bug.

See merge request easycorp/zentaopms!354
2021-11-09 01:14:50 +00:00
xieqiyu 1c4840c2c0 * Fix a bug. 2021-11-09 09:11:16 +08:00
李玉春 821f18f770 Merge branch 'sprint/170_sunhao/add_icons' into 'sprint/170'
* Add new icons: version、thumbs-up、thumbs-down.

See merge request easycorp/zentaopms!318
2021-11-09 00:37:13 +00:00
root b9dc220fd9 * Finish task #43918 2021-11-09 08:35:27 +08:00
李玉春 ddbc2d2342 Merge branch 'sprint/170_xieqiyu_16058' into 'sprint/170'
* Fix bug#16058.

See merge request easycorp/zentaopms!352
2021-11-09 00:33:26 +00:00
xieqiyu e53d644169 * Fix bug#16058. 2021-11-08 19:13:09 +08:00
李玉春 5f372cea88 Merge branch 'spring/170_hufangzhou_43904' into 'sprint/170'
* Code for task #43904.

See merge request easycorp/zentaopms!351
2021-11-08 10:47:38 +00:00
hufangzhou d10834ab9f * Code for task #43904. 2021-11-08 18:02:15 +08:00
李玉春 b778d246c2 Merge branch 'sprint/170_xieqiyu_16051' into 'sprint/170'
* Fix bug#16051.

See merge request easycorp/zentaopms!344
2021-11-08 09:34:43 +00:00
xieqiyu 8f2deab146 * Adjust code style. 2021-11-08 17:22:29 +08:00
李玉春 21ffe0c678 Merge branch 'spring/170_hufangzhou_16065' into 'sprint/170'
* Fix bug #16065.

See merge request easycorp/zentaopms!348
2021-11-08 09:16:16 +00:00
hufangzhou 1d7c3b30c5 * Fix bug #16065. 2021-11-08 17:14:35 +08:00
李玉春 79b2c8c67a Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Finish task #43899.

See merge request easycorp/zentaopms!345
2021-11-08 08:47:05 +00:00
hufangzhou c027028759 * Finish task #43899. 2021-11-08 16:44:42 +08:00
xieqiyu 74c1b31476 * Fix bug#16051. 2021-11-08 16:37:19 +08:00
李玉春 e384b3be5f Merge branch 'sprint/170_hufangzhou_16062' into 'sprint/170'
* Fix bug #16062.

See merge request easycorp/zentaopms!342
2021-11-08 08:33:05 +00:00
hufangzhou 9f27d5918b * Fix bug #16062. 2021-11-08 16:29:22 +08:00
李玉春 784eba13ab Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170'
* Fix bug.

See merge request easycorp/zentaopms!341
2021-11-08 07:59:30 +00:00
李玉春 09d50fd19c Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.

See merge request easycorp/zentaopms!338
2021-11-08 07:25:33 +00:00
xieqiyu eb8300049f * Fix bug. 2021-11-08 15:07:05 +08:00
李玉春 7e1412258c Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!339
2021-11-08 07:06:48 +00:00
mayue b305831daf * Fix bug #15688. 2021-11-08 15:04:55 +08:00
李玉春 261d027273 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!336
2021-11-08 06:40:53 +00:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00