Commit Graph
48825 Commits
Author SHA1 Message Date
lanzongjun d8a5944a84 * Finish Bug 2022-12-08 15:15:49 +08:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00
wangyidong dd7dfa2dc1 * fix bug #30660. 2022-12-08 14:37:24 +08:00
wangyidong 9a1d82200b * fix bug #30667. 2022-12-08 14:32:51 +08:00
lanzongjun e6989dc17c * Finish Bug #30687 2022-12-08 14:32:27 +08:00
Yagami fb95d28f5a * Fix bug #30569. 2022-12-08 14:17:43 +08:00
Yagami 7deb827112 * Fix bug #30683. 2022-12-08 14:12:43 +08:00
孙广明 31ef3e0260 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480

See merge request easycorp/zentaopms!6498
2022-12-08 06:05:50 +00:00
孙广明 4566881b75 Merge branch 'master_xieqiyu_30588' into 'master'
* Fix bug#30588.

See merge request easycorp/zentaopms!6499
2022-12-08 06:05:33 +00:00
孙广明 27e38b30c3 Merge branch 'zhouxin_feedback_1646' into 'master'
* Resolve feedback #1646.

See merge request easycorp/zentaopms!6503
2022-12-08 06:05:14 +00:00
zhouxin bdeb83477b * Resolve feedback #1646. 2022-12-08 06:00:06 +00:00
lanzongjun 0f4ef051bf * Finish Bug #30480 2022-12-08 13:44:28 +08:00
wangyidong 8a3d6c4dcd * fix bug #30665. 2022-12-08 13:43:13 +08:00
xieqiyu 6038b69ea4 * Fix bug#30651. 2022-12-08 13:31:00 +08:00
Yagami c2eb955c56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-08 13:16:06 +08:00
Yagami fd0b180d71 * Finish task #78676. 2022-12-08 13:15:48 +08:00
xieqiyu a7b96c881a * Fix bug#30644. 2022-12-08 12:36:50 +08:00
wangyidong 7c6c2cf8e6 Merge branch 'sprint/xuanxuan_127' 2022-12-08 12:24:08 +08:00
xieqiyu c4c0fe7271 * Fix bug#30550,#30607. 2022-12-08 12:18:55 +08:00
文睿 李 cb729e1864 * resolve conflict of task model, add method for task searching. 2022-12-08 03:44:50 +00:00
Wenrui LI ce8a83998c * fix zentaobot paging and command concatenation. 2022-12-08 11:38:04 +08:00
xieqiyu 6b61f14d93 * Fix bug#30588. 2022-12-08 11:19:14 +08:00
lanzongjun d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
wangyidong b7dfd47433 * fix bug. 2022-12-08 11:04:55 +08:00
孙广明 95da812147 Merge branch 'master_xieqiyu_30613' into 'master'
* Fix bug#30613.

See merge request easycorp/zentaopms!6494
2022-12-08 02:50:39 +00:00
孙广明 99f18346bb Merge branch 'master_xieqiyu_78690' into 'master'
* Finish task#78690.

See merge request easycorp/zentaopms!6495
2022-12-08 02:50:29 +00:00
孙广明 5a7fdb8ec5 Merge branch 'master_xieqiyu_78699' into 'master'
* Finish task#78699.

See merge request easycorp/zentaopms!6496
2022-12-08 02:50:18 +00:00
孙广明 132f585eb2 Merge branch 'master_xieqiyu_78698' into 'master'
* Finish task#78698.

See merge request easycorp/zentaopms!6497
2022-12-08 02:50:08 +00:00
孙广明 c9fda51093 Merge branch 'master_xieqiyu_78661' into 'master'
Master xieqiyu 78661

See merge request easycorp/zentaopms!6493
2022-12-08 02:49:59 +00:00
xieqiyu 847bb6be13 * Finish task#78698. 2022-12-08 10:46:58 +08:00
xieqiyu 8472e0a191 * Finish task#78699. 2022-12-08 10:34:46 +08:00
xieqiyu 80af5ddba5 * Finish task#78690. 2022-12-08 10:06:46 +08:00
wangyidong e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
xieqiyu 44c075b0ae * Fix bug#30613. 2022-12-08 09:50:30 +08:00
wangyidong 3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
王怡栋 e259eaea2b Merge branch 'bug_30581' into 'master'
* Fix bug#30581

See merge request easycorp/zentaopms!6487
2022-12-08 00:30:37 +00:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
wangyidong 771dd4c8ed * code for task #78908,78918. 2022-12-07 17:42:41 +08:00
孙广明 bfab34538b Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78697 Bug #30616#30558

See merge request easycorp/zentaopms!6492
2022-12-07 08:01:02 +00:00
lanzongjun 7189103e60 * Finish Bug #30558 2022-12-07 15:58:31 +08:00
lanzongjun 04cb6a9cac * Finish Bug #30616 2022-12-07 15:53:10 +08:00
Yagami d2044980df * Code for release's branch. 2022-12-07 15:29:15 +08:00
lanzongjun 87e1db0555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 15:21:23 +08:00
lanzongjun 29d8ff292a * Finish Task #78697 2022-12-07 15:17:35 +08:00
孙广明 50bb73fe57 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78673#78688

See merge request easycorp/zentaopms!6489
2022-12-07 07:01:14 +00:00
孙广明 5ae031e0c6 Merge branch 'zhouxin_feedback_1659' into 'master'
* Fix filter of base64.

See merge request easycorp/zentaopms!6491
2022-12-07 07:00:29 +00:00
zhouxin f41dc323bf * Fix filter of base64. 2022-12-07 06:58:26 +00:00
Yagami cea279faf1 * Code for task #78672. 2022-12-07 14:49:29 +08:00
Yagami 57dbeba6d9 * Finish task #78672. 2022-12-07 14:45:14 +08:00
lanzongjun 5f3444278b * Finish Task #78688 2022-12-07 14:22:27 +08:00