Commit Graph
37582 Commits
Author SHA1 Message Date
renying d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +08:00
renying b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
renying 6f8dfc3af3 Fixbug#21457 2022-04-20 14:03:50 +08:00
renying d08719a839 Fixbug#21457 2022-04-20 10:28:41 +08:00
李玉春 2727d2fd9e Merge branch 'cyy_21763' into 'master'
* Fix bug #21763.

See merge request easycorp/zentaopms!2973
2022-04-18 02:21:06 +00:00
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
孙广明 ae094b7350 Merge branch 'sprint/unitTest_liumengyi_bug' into 'master'
* FIx bug of bug unit test.

See merge request easycorp/zentaopms!2971
2022-04-18 00:44:43 +00:00
liumengyi ae5dc3a990 * FIx bug of bug unit test. 2022-04-18 08:41:47 +08:00
朱金勇 7aeeb96c42 Merge branch 'fix_bug_wangxiaomeng_#17253' into 'master'
fix_bug_17253

See merge request easycorp/zentaopms!2959
2022-04-18 00:13:57 +00:00
朱金勇 1ad5accfce Merge branch 'sprint/sunhao/bug19052' into 'master'
* bug #19052, fix width for some models.

See merge request easycorp/zentaopms!2965
2022-04-18 00:10:55 +00:00
孙广明 a5cb540de9 Merge branch 'master_xieqiyu_19318' into 'master'
* Fix bug#19318.

See merge request easycorp/zentaopms!2961
2022-04-15 07:46:54 +00:00
孙广明 ae2f0bad83 Merge branch 'fixbugs_zhouxin_21801' into 'master'
* Fix bug #21801.

See merge request easycorp/zentaopms!2969
2022-04-15 07:42:23 +00:00
王怡栋 bf33ed0efe Merge branch 'fixbug' into 'master'
* Fix bug for product index.

See merge request easycorp/zentaopms!2967
2022-04-15 07:38:00 +00:00
王怡栋 96402db109 Merge branch 'sprint/fixbug_hufangzhou_20062' into 'master'
* Fix bug #20062.

See merge request easycorp/zentaopms!2966
2022-04-15 07:37:43 +00:00
王怡栋 dc0635555d Merge branch 'jira' into 'master'
* Code for convert jira.

See merge request easycorp/zentaopms!2968
2022-04-15 07:36:39 +00:00
zhouxin b04e4d2236 * Fix bug #21801. 2022-04-15 07:36:19 +00:00
孙广明 1bdbd20394 * Code for convert jira. 2022-04-15 15:34:37 +08:00
tanghucheng 3707793e40 * Fix bug for product index. 2022-04-15 15:27:46 +08:00
hufangzhou a629ac2c12 * Fix bug #20062. 2022-04-15 15:22:58 +08:00
孙广明 762a8e065c Merge branch 'fixbug_sunjun_19732' into 'master'
*Fixbug_sunjun_19732

See merge request easycorp/zentaopms!2963
2022-04-15 06:48:23 +00:00
孙广明 0b71ec6380 Merge branch 'sprint/unitTest_liumengyi_tree' into 'master'
* Add unit test of tree.

See merge request easycorp/zentaopms!2964
2022-04-15 06:47:25 +00:00
王怡栋 8f11396658 Merge branch 'fixbug' into 'master'
* Fix bug #17634.

See merge request easycorp/zentaopms!2962
2022-04-15 06:42:32 +00:00
tanghucheng 9761644a92 * Fix bug #17634. 2022-04-15 14:41:18 +08:00
liumengyi 51aa9835f6 * Add unit test of tree. 2022-04-15 14:35:38 +08:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
wangxiaomeng 8a5e5c12d5 fix_bug#17253 2022-04-15 14:27:51 +08:00
sunjun 3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +08:00
xieqiyu eda23f27f1 * Fix bug: manage contacts have two chosen. 2022-04-15 14:16:07 +08:00
wangxiaomeng c1a51d747c fix_bug #17253 2022-04-15 14:07:42 +08:00
xieqiyu 477a2a4162 * Fix bug#19318. 2022-04-15 13:57:35 +08:00
王怡栋 2478e067f4 * code for bug #15386. 2022-04-15 13:43:45 +08:00
王怡栋 0bc5f82ce7 Merge branch 'fixbugs_zhouxin_21783' into 'master'
* Fix bug #21783.

See merge request easycorp/zentaopms!2960
2022-04-15 05:23:14 +00:00
李玉春 d426e7cf75 Merge branch 'devops26_52594' into 'master'
Fix bug#16732

See merge request easycorp/zentaopms!2957
2022-04-15 05:07:31 +00:00
李玉春 5540a02c0b Merge branch 'cyy_bug' into 'master'
* Modify function name.

See merge request easycorp/zentaopms!2956
2022-04-15 05:05:41 +00:00
王怡栋 26f19a6085 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-15 11:20:54 +08:00
王怡栋 b9ebcd6944 * code for bug #21655. 2022-04-15 11:20:28 +08:00
zhouxin 5f11d21fbf * Fix bug #21783. 2022-04-15 03:19:06 +00:00
王怡栋 c3608453ec Merge branch 'fixbugs_zhouxin_11376' into 'master'
* Fix bug #11376.

See merge request easycorp/zentaopms!2958
2022-04-15 02:38:34 +00:00
王怡栋 cb0ae07875 Merge branch 'sprint/fixbug_hufangzhou_19726' into 'master'
* Fix bug #19726.

See merge request easycorp/zentaopms!2955
2022-04-15 02:35:48 +00:00
zhouxin 91aeb0a5b3 * Adjust code. 2022-04-15 02:35:39 +00:00
zhouxin 773895ec3b * Fix bug #11376. 2022-04-15 02:30:49 +00:00
wangxiaomeng 4eab870165 fix_bug_17253 2022-04-15 10:29:09 +08:00
zenggang 76278f3ca8 * Fix bug#16732 2022-04-15 02:21:33 +00:00
caoyanyi 69cc01d410 * Modify function name. 2022-04-15 09:42:19 +08:00
hufangzhou 82f113268f * Fix bug #19726. 2022-04-15 09:37:08 +08:00
朱金勇 31306a52af Merge branch 'autotest_ly' into 'master'
add case and bug module

See merge request easycorp/zentaopms!2954
2022-04-15 01:27:03 +00:00
liyang 4911e9d76a add case and bug module 2022-04-15 09:25:08 +08:00
王怡栋 2835c7da3e Merge branch 'sprint/tianshujie_bug17551' into 'master'
Sprint/tianshujie bug17551

See merge request easycorp/zentaopms!2951
2022-04-15 01:13:46 +00:00
王怡栋 27f7a4ea50 Merge branch 'fixbug' into 'master'
* Fix bug #1780.

See merge request easycorp/zentaopms!2942
2022-04-15 01:12:17 +00:00