Commit Graph
48948 Commits
Author SHA1 Message Date
王怡栋 7ca31ef126 Merge branch 'sprint/konglingmao_#feedback1279' into 'master'
* Resolved feedback #1279 ,testcase display error when import file have html char.

See merge request easycorp/zentaopms!6501
2022-12-08 08:30:16 +00:00
孙广明 3d2d237c4a Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30689#30700#30664

See merge request easycorp/zentaopms!6508
2022-12-08 08:28:58 +00:00
lanzongjun c73d589b54 * Finish Bug #30664 2022-12-08 16:28:38 +08:00
lanzongjun 43b667ba2b * Finish Bug #30700 2022-12-08 16:16:16 +08:00
xieqiyu 4724af01bb * Fix bug#30698. 2022-12-08 16:11:20 +08:00
lanzongjun e9bc72f2b2 * Finish Bug #30689 2022-12-08 15:56:30 +08:00
孙广明 8c415fad8c Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix build create

See merge request easycorp/zentaopms!6507
2022-12-08 07:49:48 +00:00
lanzongjun f7b600ffcb remove code 2022-12-08 15:49:06 +08:00
liuhong 0d9f59c49b * Finish tash for Lang and multiple #78665. 2022-12-08 07:48:25 +00:00
lanzongjun 1b4791f74b * Fix build create 2022-12-08 15:45:36 +08:00
孙广明 38956c269c Merge branch 'mayue_feedback#130_story#32666' into 'master'
* Finish feedback#130 and story#32666.

See merge request easycorp/zentaopms!6506
2022-12-08 07:28:22 +00:00
孙广明 53a538f203 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30687

See merge request easycorp/zentaopms!6505
2022-12-08 07:16:35 +00:00
lanzongjun d8a5944a84 * Finish Bug 2022-12-08 15:15:49 +08:00
liuhong 0094f902f5 * Finish Task #78665. 2022-12-08 06:55:05 +00:00
mayue 9b7c5be5ca * Finish feedback#130 and story#32666. 2022-12-08 14:46:33 +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
Lufei 79540ab480 * Use string instead of varchar. 2022-12-08 14:23:23 +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
Lufei 91d4f420ec * Change resetFileName. 2022-12-08 14:00:48 +08:00
Lufei d6db014f99 * Fix checkPriv error. 2022-12-08 14:00:14 +08:00
zhouxin bdeb83477b * Resolve feedback #1646. 2022-12-08 06:00:06 +00:00
孔令茂 72eda68846 * Resolved feedback #1279 ,testcase display error when import file have html char. 2022-12-08 05:55:42 +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
liuhong 8ad99f03a5 * Adjuct code #78665. 2022-12-08 04:24:10 +00: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