Commit Graph
29417 Commits
Author SHA1 Message Date
xieqiyu 15867e4fd3 * Fix bug#16638. 2021-11-23 19:05:34 +08:00
zhouxin 2b3df26fd8 Fix bug 16564. 2021-11-23 18:47:56 +08:00
zhengrunyu 16873a8154 *Finish task #16619. 2021-11-23 17:50:26 +08:00
tianshujie e4f00ca20e Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-23 17:39:03 +08:00
tianshujie d8d277842b * Fix bug #16549. 2021-11-23 17:38:43 +08:00
xieqiyu 35bdfa9376 * Fix bug#16565. 2021-11-23 17:33:10 +08:00
songchenxuan 049ae60320 * Fix bug #16642. 2021-11-23 17:30:37 +08:00
songchenxuan 6922251f39 * Fix bug 16596. 2021-11-23 15:48:27 +08:00
zhengrunyu 4f67ffed05 *Fix bug #16547. 2021-11-23 15:39:58 +08:00
songchenxuan ce4def0174 Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug 2021-11-23 15:36:17 +08:00
songchenxuan 9be4ee136f * Fix bug #16560. 2021-11-23 15:35:21 +08:00
tianshujie 288cdd6817 * Fix bug #16628. 2021-11-23 15:31:38 +08:00
tianshujie 33e557cd18 * Fix bug #16577. 2021-11-23 15:07:07 +08:00
tianshujie ec5ca42e49 * Fix bug #16577. 2021-11-23 15:01:51 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
hufangzhou 5ac4cfe9f9 * Code for bug #16559. 2021-11-23 14:13:44 +08:00
hufangzhou fbcc390d81 * Code for bug #16580. 2021-11-23 13:35:03 +08:00
hufangzhou c0d4264148 * Fix bug #16564. 2021-11-23 10:10:14 +08:00
hufangzhou 984aa6b1e7 * Fix bug #16559. 2021-11-23 09:27:08 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' zentaopms_15.8_20211122 2021-11-22 16:59:40 +08:00
王怡栋 b0b410cb91 Merge branch 'sprint/173_xieqiyu_16548' into 'sprint/170'
* Fix bug#16548.

See merge request easycorp/zentaopms!596
2021-11-22 08:54:19 +00:00
王怡栋 c5c2a9f34a Merge branch 'sprint/170_hufangzhou_package' into 'sprint/170'
* Add the new version.

See merge request easycorp/zentaopms!595
2021-11-22 08:53:38 +00:00
xieqiyu 578d51ce01 * Fix bug#16548. 2021-11-22 16:49:06 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
孙广明 74185a47fe Merge branch 'sprint/173_xieqiyu_14507' into 'sprint/170'
* Fix bug#16507.

See merge request easycorp/zentaopms!594
2021-11-22 08:35:58 +00:00
xieqiyu e7578880a7 * Fix bug#16507. 2021-11-22 16:26:36 +08:00
王怡栋 827a5a6529 Merge branch 'sprint/173_xieqiyu_16545' into 'sprint/170'
* Fix bug#16545.

See merge request easycorp/zentaopms!592
2021-11-22 08:19:27 +00:00
xieqiyu df71f8ff9e * Fix bug#16545. 2021-11-22 16:17:37 +08:00
王怡栋 b5cc969e0a Merge branch 'sprint/170_zhouxin_16468' into 'sprint/170'
Fix bug 16468.

See merge request easycorp/zentaopms!585
2021-11-22 08:17:09 +00:00
zhouxin 1f47ec43c9 . 2021-11-22 16:15:37 +08:00
王怡栋 3d4cff75f7 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix bug#16542.

See merge request easycorp/zentaopms!590
2021-11-22 08:11:43 +00:00
王怡栋 a452521323 Merge branch 'sprint/170_tianshujie_16541' into 'sprint/170'
* Fix bug #16541.

See merge request easycorp/zentaopms!591
2021-11-22 08:10:48 +00:00
tianshujie 7802bc6a47 * Fix bug #16541. 2021-11-22 16:01:31 +08:00
xieqiyu e0d73b8574 * Fix bug#16542. 2021-11-22 15:59:41 +08:00
zhouxin 1d2ce49b24 Add comment. 2021-11-22 15:58:14 +08:00
李玉春 f45a268731 Merge branch 'sprint/170_tianshujie_bug' into 'sprint/170'
* Fix code error.

See merge request easycorp/zentaopms!589
2021-11-22 07:34:41 +00:00
tianshujie eca1559259 * Fix code error. 2021-11-22 15:33:04 +08:00
zhouxin cf29cfdca7 Delete a kongge. 2021-11-22 15:23:52 +08:00
zhouxin 72f57c6f01 Fix bug 16468. 2021-11-22 15:19:22 +08:00
李玉春 68b6020d06 Merge branch 'sprint/170_tianshujie_16533' into 'sprint/170'
* Fix bug #16533.

See merge request easycorp/zentaopms!586
2021-11-22 07:17:34 +00:00
tianshujie 76bd965626 * Modify the code. 2021-11-22 15:16:51 +08:00
孙广明 87ab1ecc76 Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.

See merge request easycorp/zentaopms!587
2021-11-22 07:12:13 +00:00
tianshujie f6797fe2ea * Modify the code. 2021-11-22 15:11:20 +08:00
zhengrunyu 995ca51b88 *Finish task #16529. 2021-11-22 15:06:52 +08:00
tianshujie a6246e8ad6 * Fix bug #16533. 2021-11-22 15:02:04 +08:00
李玉春 8221875b47 Merge branch 'sprint/170_hufangzhou_16512' into 'sprint/170'
* Fix bug #16512.

See merge request easycorp/zentaopms!580
2021-11-22 06:55:26 +00:00
hufangzhou b924509817 * Remove the unused code. 2021-11-22 14:52:20 +08:00
zhouxin 7ec2b00493 Fix bug 16468. 2021-11-22 14:48:19 +08:00
孙广明 d3c2f014fe Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.

See merge request easycorp/zentaopms!584
2021-11-22 06:41:02 +00:00
zhengrunyu 1a9175f485 *Finish task #16529. 2021-11-22 14:36:56 +08:00