Commit Graph
2570 Commits
Author SHA1 Message Date
李玉春 635693bef4 Merge branch 'sprint/244_wzm_70007' into 'master'
* finish task 70007 & 71896

See merge request easycorp/zentaopms!5689
2022-10-10 00:56:52 +00:00
wangzemei f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
wangzemei ec7844f035 * compatible datatable style 2022-10-09 15:42:00 +08:00
wangzemei 4a656cf175 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 15:19:48 +08:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 dc6b265503 * Adjust codes. 2022-10-09 14:48:37 +08:00
曹延义 0b55fb4095 * Adjust code. 2022-10-09 14:27:50 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
王怡栋 05d4c462a7 Merge branch 'master_28214' into 'master'
*Fix bug #28214.

See merge request easycorp/zentaopms!5659
2022-10-09 05:09:28 +00:00
王怡栋 1f68a6b1e7 Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.

See merge request easycorp/zentaopms!5658
2022-10-09 05:08:34 +00:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
曹延义 bff2bdcbb3 * Finish task #71877. 2022-10-09 10:07:41 +08:00
wangzemei ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
liuhong 0f9ee29fec *Fix bug #28214. 2022-09-30 07:20:17 +00:00
xieqiyu 57dd6eb716 * Fix bug#26098. 2022-09-30 07:19:21 +00:00
wangzemei 22b77ec407 * format Code 2022-09-30 14:55:46 +08:00
wangzemei 14742e0ad6 * fix bug 28210 2022-09-30 14:41:11 +08:00
xieqiyu c4818a0fec * Fix bug#26837. 2022-09-30 05:58:46 +00:00
tianshujie 7e523df39b * Fix bug #28253. 2022-09-30 11:31:29 +08:00
李玉春 a5cd8d997e Merge branch 'sprint/wangzemei/28231' into 'master'
* Fix bug 28231

See merge request easycorp/zentaopms!5632
2022-09-30 01:29:39 +00:00
李玉春 5e719e9a48 Merge branch 'sprint/wangzemei/28234' into 'master'
* fix bug 28234 & 28215

See merge request easycorp/zentaopms!5635
2022-09-30 01:29:10 +00:00
tianshujie ecdfcffa58 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70505 2022-09-30 09:18:19 +08:00
wangzemei 5c579dc137 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28234 2022-09-30 09:09:10 +08:00
wangzemei 7c6d631ee8 * fix bug 28215 2022-09-30 09:08:42 +08:00
李玉春 7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
tianshujie 750e7c41d0 * Fix bug #28161. 2022-09-30 08:48:51 +08:00
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
wangzemei 69debf9c11 * Fix bug 28231 2022-09-29 17:52:23 +08:00
tianshujie badfc68859 * Fix bug #28165. 2022-09-29 17:42:36 +08:00
wangzemei 4270f963ae * Fix bug #28234 2022-09-29 17:42:34 +08:00
xieqiyu 100c4359dd * Fix bug#27048. 2022-09-29 08:34:34 +00:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
tianshujie 01c194668b * Finish task #70505. 2022-09-29 15:59:43 +08:00
wangzemei ac72fe5540 * extract common variable for kanban colWidth 2022-09-29 13:24:23 +08:00
wangzemei e38d934cbd * extract common variable for kanban colWidth 2022-09-29 12:20:54 +08:00
曹延义 d972797ed2 * Modify kanban set validate. 2022-09-29 11:23:20 +08:00
wangzemei 769d447a78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 10:52:29 +08:00
曹延义 885121c725 * Modify classic model style. 2022-09-29 10:27:45 +08:00
wangzemei 45ec08b5e1 * add placeholder 2022-09-29 10:26:20 +08:00
wangzemei 7b222116eb * kanban setting: add isset 2022-09-29 09:58:36 +08:00
曹延义 2160b5efff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 09:18:42 +08:00
wangzemei 363c906500 * add kanban setting input limit 2022-09-28 15:05:40 +08:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie 7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00
liuyongkai 7567b5b499 * Fix bug #28056. 2022-09-27 08:16:01 +00:00
wangzemei b25fa909ce * finish front show about task#71075 2022-09-27 11:28:50 +08:00