Commit Graph
32307 Commits
Author SHA1 Message Date
孙华伟 30c5754f26 *Fix bug#22626. 2022-05-18 15:59:01 +08:00
王怡栋 cbef1578ca Merge branch 'master_xieqiyu_54467' into 'master'
* Code for task#54467.

See merge request easycorp/zentaopms!3481
2022-05-18 06:21:47 +00:00
xieqiyu b223f55900 * Code for task#54467. 2022-05-18 14:00:29 +08:00
liumengyi 497aea6b14 * Fix bug #22590. 2022-05-18 13:36:06 +08:00
sunjun 728d85916e fixbug_sunjun_54324 2022-05-18 04:27:46 +00:00
孙广明 958b890941 Merge branch 'sprint/190_mayue_bug#22587' into 'master'
* Fix bug #22587.

See merge request easycorp/zentaopms!3475
2022-05-18 03:18:38 +00:00
孙广明 cecff5ddec Merge branch 'sprint/191_liumengyi_54336' into 'master'
Sprint/191 liumengyi 54336

See merge request easycorp/zentaopms!3474
2022-05-18 03:17:58 +00:00
liumengyi e83da7c524 * Fix bug for task #54336. 2022-05-18 11:15:21 +08:00
mayue 9c336a223e * Fix bug #22587. 2022-05-18 03:15:15 +00:00
孙广明 cc83dcc446 Merge branch 'sprint/190_mayue_bug#22574' into 'master'
* Fix bug #22574.

See merge request easycorp/zentaopms!3472
2022-05-18 03:12:11 +00:00
孙广明 fe6c8d18a2 Merge branch 'sprint/190_zg_54208' into 'master'
* Finish task#54208

See merge request easycorp/zentaopms!3469
2022-05-18 03:11:51 +00:00
mayue 117865e63d * Optimize code. 2022-05-18 03:11:12 +00:00
wangyidong e9289b68d5 * adjust for data. 2022-05-18 11:11:11 +08:00
liumengyi aacfdcdc1c * Fix bug for task #54336. 2022-05-18 11:10:57 +08:00
王怡栋 9dedd40457 Merge branch 'master_xieqiyu_54468' into 'master'
* Finish task#54468.

See merge request easycorp/zentaopms!3473
2022-05-18 03:09:09 +00:00
孙广明 e7bddf88b1 Merge branch 'sprint/190_mayue_bug#22414' into 'master'
* Fix bug #22414.

See merge request easycorp/zentaopms!3465
2022-05-18 03:08:53 +00:00
孙广明 a1a6ba646f Merge branch 'sprint/190_mayue_bug#22240' into 'master'
* Fix bug #22240.

See merge request easycorp/zentaopms!3471
2022-05-18 03:04:41 +00:00
xieqiyu 5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
mayue bf4ac6a465 * Fix bug #22574. 2022-05-18 02:48:51 +00:00
王怡栋 44d98b2cc3 Merge branch 'sprint/daitingting_flow_addID' into 'master'
* Add id for post data.

See merge request easycorp/zentaopms!3463
2022-05-18 02:44:59 +00:00
mayue 1e950a8787 * Fix bug #22240. 2022-05-18 02:40:15 +00:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
zenggang ba542db897 * Finish task#54208 2022-05-18 02:25:43 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
孙广明 be0849806b Merge branch 'sprint/191_liumengyi_fixbug' into 'master'
* Fix bug #22585.

See merge request easycorp/zentaopms!3468
2022-05-18 02:15:04 +00:00
孙广明 261ed30d03 Merge branch 'sprint_sunjun_54321' into 'master'
sprint_sunjun_54321

See merge request easycorp/zentaopms!3458
2022-05-18 02:13:38 +00:00
liumengyi 5bdc188491 * Code format for bug #22585. 2022-05-18 10:12:42 +08:00
liumengyi b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
sunjun 38c451370a add notes 2022-05-18 02:04:49 +00:00
sunjun 428d4a6fcf add notes 2022-05-18 02:01:55 +00:00
王怡栋 ad6b686c0d Merge branch 'master_xieqiyu_54467' into 'master'
* Finish task#54467.

See merge request easycorp/zentaopms!3466
2022-05-18 01:52:49 +00:00
sunjun 0349e86aae addNotes 2022-05-18 01:47:55 +00:00
xieqiyu a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00
mayue 97c625d6b1 * Optimize code. 2022-05-18 01:43:23 +00:00
sunjun fca35134b5 sprint_sunjun_54324 2022-05-18 01:42:09 +00:00
mayue dcd9b55d0e * Fix bug #22414. 2022-05-18 01:40:27 +00:00
liumengyi aa46dc6595 * Code format of bug #22582. 2022-05-18 09:13:05 +08:00
liumengyi 2b80e3d91f * Fix bug #22582. 2022-05-18 09:11:18 +08:00
daitingting d9ee3c8fdc * Add id for post data. 2022-05-18 01:07:33 +00:00
sunjun fca85b0bcc sprint_fixbug 2022-05-18 00:59:07 +00:00
孙广明 e6328140f5 Merge branch 'sunhuawei_fixbug_22375' into 'master'
*Fix bug #22375.

See merge request easycorp/zentaopms!3451
2022-05-18 00:57:42 +00:00
liumengyi 2f8e2e03e3 * Finish task #54336. 2022-05-18 08:54:40 +08:00
李玉春 282f694f17 Merge branch 'sprint/191_tianshujie_54391' into 'master'
Sprint/191 tianshujie 54391

See merge request easycorp/zentaopms!3453
2022-05-18 00:53:44 +00:00
tianshujie 23111eff01 * Delete duplicate personnel. 2022-05-18 08:50:10 +08:00
sunjun ae9e3b7df4 sprint_sunjun_54327 2022-05-17 13:54:08 +00:00
sunjun 3ce847a623 sprint_sunjun_54326 2022-05-17 13:38:50 +00:00
sunjun d6bf1abf9f sprint_sunjun_54325 2022-05-17 12:47:45 +00:00
李玉春 1f768098c6 Merge branch 'sprint/191_liumengyi_54354' into 'master'
Sprint/191 liumengyi 54354

See merge request easycorp/zentaopms!3461
2022-05-17 09:28:22 +00:00
孙华伟 545dcf550c *Optimize the code. 2022-05-17 17:28:11 +08:00
liumengyi bff314e0d4 * Modify code for task #54354. 2022-05-17 17:26:17 +08:00