Commit Graph
32325 Commits
Author SHA1 Message Date
liumengyi dee4ff7043 * Finish task #54318. 2022-05-19 08:55:27 +08:00
李玉春 79006b3f89 Merge branch 'sprint/tianshujie_22636' into 'master'
* Fix bug #22636.

See merge request easycorp/zentaopms!3494
2022-05-18 08:57:05 +00:00
tianshujie 56bb8fbd35 * Fix bug #22636. 2022-05-18 16:53:12 +08:00
tianshujie 45e4fcdfab * Fix bug #22636. 2022-05-18 16:51:09 +08:00
孙广明 9eb969342d Merge branch 'sprint/191_zhouxin_54351' into 'master'
Sprint/191 zhouxin 54351

See merge request easycorp/zentaopms!3490
2022-05-18 08:09:34 +00:00
李玉春 f5fb327f55 Merge branch 'sprint/191_liumengyi_fixbug' into 'master'
* Fix bug #22633.

See merge request easycorp/zentaopms!3488
2022-05-18 08:04:59 +00:00
liumengyi 1bc26d519a * Code format. 2022-05-18 16:03:25 +08:00
孙广明 3dfe14a43c Merge branch 'sunhuawei_fixbug_22626' into 'master'
*Fix bug#22626.

See merge request easycorp/zentaopms!3489
2022-05-18 08:01:24 +00:00
孙广明 55d5da68d6 Merge branch 'sunhuawei_fixbug_22621' into 'master'
*Fix bug #22621.

See merge request easycorp/zentaopms!3487
2022-05-18 08:01:17 +00:00
孙华伟 0d132275da Update recordestimate.js 2022-05-18 07:59:48 +00:00
孙华伟 30c5754f26 *Fix bug#22626. 2022-05-18 15:59:01 +08:00
孙广明 bfdcc7b924 Merge branch 'sunhuawei_fixbug_22616' into 'master'
*Fix bug#22616.

See merge request easycorp/zentaopms!3479
2022-05-18 07:56:29 +00:00
liumengyi 06a5840978 * Fix bug #22633. 2022-05-18 15:52:51 +08:00
zhouxin c5be32065d * Fix bug. 2022-05-18 07:50:26 +00:00
zhouxin 094db2e505 * Adjust code. 2022-05-18 07:39:05 +00:00
zhouxin 5ef4782e82 * Finish task #54351. 2022-05-18 07:31:45 +00:00
liumengyi be5daac0ba * Fix bug #22628. 2022-05-18 15:23:12 +08:00
孙华伟 587bc3c414 *Fix bug #22621. 2022-05-18 14:48:09 +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
孙华伟 b59fb9cc1c *Fix bug#22616. 2022-05-18 13:43:48 +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