Commit Graph
42070 Commits
Author SHA1 Message Date
zhouxudong f85e8c2df5 * Finish task #60383. 2022-07-28 07:04:40 +00:00
zhouxudong d505caff81 * Finish task #60388. 2022-07-28 01:32:22 +00:00
zhouxudong 7c506f9bd7 * Finish task #60388. 2022-07-27 05:23:34 +00:00
zhouxudong 92c323d600 * Finish task #60388. 2022-07-15 05:14:48 +00:00
孙广明 6a4d372473 Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527
2022-07-14 01:46:53 +00:00
孙广明 1978dbd4b8 Merge branch 'fixbug_25216' into 'master'
Fixbug 25216

See merge request easycorp/zentaopms!4528
2022-07-14 01:46:40 +00:00
孙广明 fe8f028590 Merge branch 'fixbug_25174' into 'master'
fixbug_25174

See merge request easycorp/zentaopms!4519
2022-07-14 01:45:08 +00:00
孙广明 d41303c7e2 Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic

See merge request easycorp/zentaopms!4515
2022-07-14 01:44:53 +00:00
孙广明 1444773e4d Merge branch 'sprint/mastr_zhouxudong_code' into 'master'
* Code optimization.

See merge request easycorp/zentaopms!4522
2022-07-14 01:44:40 +00:00
sunjun a40ae1ee63 fixbug_25216 2022-07-14 01:43:36 +00:00
zenggang 38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
王怡栋 842a44f27c Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476, and fix bug #25063, and fix bug #25230.

See merge request easycorp/zentaopms!4525
2022-07-14 01:36:52 +00:00
liumengyi 026e28b96b * Fix bug for task #60476. 2022-07-14 09:35:59 +08:00
liumengyi b242d1319f * Fix bug #25230. 2022-07-14 09:28:42 +08:00
sunjun 51fe9cc511 fixbug_25216 2022-07-14 01:22:53 +00:00
孙广明 665901a969 * Fix bug #25226. 2022-07-14 09:09:48 +08:00
王怡栋 7523d2bd35 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add standard sql

See merge request easycorp/zentaopms!4526
2022-07-14 01:06:37 +00:00
lanzongjun 32eef59eaf * add standard sql 2022-07-14 09:05:46 +08:00
王怡栋 bb9dbe5827 Merge branch 'master_xieqiyu_25198' into 'master'
Master xieqiyu 25198

See merge request easycorp/zentaopms!4523
2022-07-14 00:57:50 +00:00
王怡栋 5a6fabfa5e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25172

See merge request easycorp/zentaopms!4521
2022-07-14 00:57:00 +00:00
liumengyi fa1b2ce2b1 * Fix bug #25063. 2022-07-14 08:54:44 +08:00
liumengyi eeb7835412 * Fix bug for task #60476. 2022-07-14 08:48:47 +08:00
sunjun 63ee113190 fixbug_25216 2022-07-14 00:44:15 +00:00
xieqiyu fcb1e2fd93 * Fix bug#25198. 2022-07-14 08:40:53 +08:00
孙广明 383a864001 * Add disabled to unclikable btn. 2022-07-14 08:39:56 +08:00
xieqiyu 2c5ca0fc6a * Fix bug#25198. 2022-07-14 08:39:46 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
王怡栋 559baff057 Merge branch 'sprint/215_liumengyi_23641' into 'master'
* Fix bug #23641.

See merge request easycorp/zentaopms!4518
2022-07-13 07:23:02 +00:00
王怡栋 677a224d84 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban actions.

See merge request easycorp/zentaopms!4520
2022-07-13 07:22:35 +00:00
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
sunjun eb07793262 fixbug_25174 2022-07-13 06:57:48 +00:00
liumengyi 51dd442c01 * Fix bug #23641. 2022-07-13 14:51:38 +08:00
王怡栋 b1bceb2917 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4517
2022-07-13 06:49:50 +00:00
王怡栋 5f062e08f9 Merge branch 'sprint/215_liumengyi_23641' into 'master'
* Fix bug #23641.

See merge request easycorp/zentaopms!4516
2022-07-13 06:48:13 +00:00
tianshujie 43507b65af * Fix bug #25186. 2022-07-13 14:48:10 +08:00
liumengyi db19c66db3 * Fix bug #23641. 2022-07-13 14:45:15 +08:00
孙广明 b9a6b4a2cc * Code for execution list order. 2022-07-13 14:45:04 +08:00
孙广明 d2c80aa71a * Code for error. 2022-07-13 14:38:58 +08:00
tianshujie 8adcde34d2 * Fix bug #23809. 2022-07-13 14:38:09 +08:00
wangyidong 2bc0a7f4c1 * fix for upgrade. 2022-07-13 14:21:13 +08:00
sunjun d5c9657af2 fixbug 2022-07-13 06:16:14 +00:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
chaideqing 83c92086eb * refactor, code format 2022-07-13 13:54:21 +08:00
王怡栋 70bd6eaa5e Merge branch 'sprint/master_zhouxudong_25163' into 'master'
* Fix bug #25163 #25166 #25170.

See merge request easycorp/zentaopms!4513
2022-07-13 05:53:10 +00:00
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
孙广明 10b3d140d2 Merge branch 'fixConflict_24687' into 'master'
fixConflict_24687

See merge request easycorp/zentaopms!4512
2022-07-13 05:45:00 +00:00
王怡栋 42629df5ab Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4511
2022-07-13 05:43:07 +00:00
liumengyi a743cf4b3f * Optimize code. 2022-07-13 13:41:48 +08:00
王怡栋 7f89cbb52e Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue

See merge request easycorp/zentaopms!4510
2022-07-13 05:35:22 +00:00