Commit Graph
27116 Commits
Author SHA1 Message Date
tianshujie dab44100d5 * Finish task #46241. 2021-12-22 13:16:32 +08:00
孙广明 434e7fb369 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for my meeting.

See merge request easycorp/zentaopms!1038
2021-12-22 00:16:44 +00:00
李玉春 c474449b54 Merge branch 'sgm_fixbug' into 'master'
* Fix project priv bug.

See merge request easycorp/zentaopms!1012
2021-12-21 09:47:11 +00:00
孙广明 802f3a2282 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for move card.

See merge request easycorp/zentaopms!1046
2021-12-21 09:31:31 +00:00
liumengyi 17cd92f7d3 * Fix bug for move card. 2021-12-21 17:30:37 +08:00
孙广明 3481d14020 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.

See merge request easycorp/zentaopms!1045
2021-12-21 09:23:53 +00:00
liumengyi 93349c241a * Fix bug. 2021-12-21 17:23:21 +08:00
liumengyi 6b7cbc74ab * Fix bug #17724, #17769, #17768, #17765, #17763, #17737. 2021-12-21 17:16:46 +08:00
孙广明 2eb7b428a5 Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.

See merge request easycorp/zentaopms!1044
2021-12-21 09:14:05 +00:00
zhengrunyu 70e0458aa2 *Finish task 46246. 2021-12-21 17:12:32 +08:00
孙广明 6d7569542c Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17780,#17770,#17760,#17759,#17743.

See merge request easycorp/zentaopms!1043
2021-12-21 09:05:28 +00:00
孙广明 b8a4936df8 Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.

See merge request easycorp/zentaopms!1041
2021-12-21 09:04:49 +00:00
zhengrunyu 28533a6427 *Finish task 46246. 2021-12-21 17:04:11 +08:00
tianshujie 03a86096c7 * Add space. 2021-12-21 17:01:47 +08:00
zhengrunyu ec286d6057 *Finish task 46246. 2021-12-21 16:59:52 +08:00
tianshujie 7b918d91f0 * Fix bug #17780,#17770,#17760,#17759,#17743. 2021-12-21 16:57:06 +08:00
zhengrunyu 25feb63a59 *Finish task 46246. 2021-12-21 16:53:49 +08:00
zhujinyong 8bd1991c83 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 16:13:07 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
朱金勇 7b2c5322a7 Merge branch 'sprint/178_hufangzhou_46097' into 'master'
* Finish task #46097.

See merge request easycorp/zentaopms!1037
2021-12-21 08:09:12 +00:00
tanghucheng 31984c6aa9 * Fix bug for my meeting. 2021-12-21 15:58:32 +08:00
hufangzhou 863965e61a * Finish task #46097. 2021-12-21 15:53:27 +08:00
hufangzhou 2809bc0b94 * Perfect details. 2021-12-21 15:42:26 +08:00
孙广明 b20d55dc28 Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17765, #17763, #17737.

See merge request easycorp/zentaopms!1036
2021-12-21 07:24:04 +00:00
liumengyi 3825315c6b * Add comment. 2021-12-21 15:23:19 +08:00
liumengyi e2cbf7dab7 * Fix bug #17765, #17763, #17737. 2021-12-21 15:21:18 +08:00
zhujinyong 816e2a3e00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 14:53:50 +08:00
zhujinyong 5a1e31adf2 * Refactor getList of branch. 2021-12-21 14:53:05 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
Yurun c19e44c044 Fix die naming compatibility 2021-12-21 14:25:53 +08:00
孙广明 0fa8bbfb70 Merge branch 'sprint/179_tianshujie_17754' into 'master'
* Fix bug #17756,#17755,#17754,#17752,#17747.

See merge request easycorp/zentaopms!1031
2021-12-21 06:03:33 +00:00
朱金勇 3a8eabb057 Merge branch 'change-die-zhangrunyu' into 'master'
Change die

See merge request easycorp/zentaopms!1029
2021-12-21 05:59:10 +00:00
tianshujie 171045fab4 * Fix bug #17756,#17755,#17754,#17752,#17747. 2021-12-21 13:59:03 +08:00
孙广明 4de57a92d2 Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.

See merge request easycorp/zentaopms!1030
2021-12-21 05:56:06 +00:00
liumengyi 3bb8ba6b1d * Change 'let' to 'var'. 2021-12-21 13:55:00 +08:00
朱金勇 f2110111fb Merge branch 'sprint/178_songchenxuan_46095' into 'master'
Sprint/178 songchenxuan 46095

See merge request easycorp/zentaopms!1028
2021-12-21 05:53:23 +00:00
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
songchenxuan 72a6d27e6c *Finish task #46095. 2021-12-21 13:48:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
朱金勇 0b213848a5 Merge branch 'sprint/178_songchenxuan_17584' into 'master'
*Fix bug #17584.

See merge request easycorp/zentaopms!1014
2021-12-21 05:38:27 +00:00
songchenxuan 72252707d3 *Fix bug #17584. 2021-12-21 11:55:35 +08:00
songchenxuan 116b1a717d *Fix bug #17584. 2021-12-21 11:54:54 +08:00
孙广明 187c67fd3b Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17694,17683.

See merge request easycorp/zentaopms!1027
2021-12-21 03:32:08 +00:00
zhujinyong 01a62fe94b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-21 11:28:26 +08:00
zhujinyong 9ed65123b5 * Fix bug: display dropmenu when no lib. 2021-12-21 11:27:55 +08:00
tianshujie 7d49e79513 * Fix bug #17694,17683. 2021-12-21 11:26:26 +08:00
朱金勇 49ae6abad6 Merge branch 'sprint/178_songchenxuan_17563' into 'master'
*Fix bug #17563.

See merge request easycorp/zentaopms!1013
2021-12-21 03:11:57 +00:00
朱金勇 338657c59f Merge branch 'sprint/178_songchenxuan_17684' into 'master'
*Fix bug #17684.

See merge request easycorp/zentaopms!1024
2021-12-21 03:09:34 +00:00
孙广明 68e2a1c668 Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Fix bug

See merge request easycorp/zentaopms!1023
2021-12-21 03:05:42 +00:00
zhengrunyu 1681d07f6a *Fix task 46163. 2021-12-21 11:04:12 +08:00