Commit Graph
37562 Commits
Author SHA1 Message Date
王怡栋 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
孙广明 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
sunjun 3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +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
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
王怡栋 98470adbe3 Merge branch 'sprint/master_zhouxudong_17353' into 'master'
Sprint/master zhouxudong 17353

See merge request easycorp/zentaopms!2953
2022-04-15 01:11:53 +00:00
zhouxudong e6ceaf1201 * Fix bug #17353. 2022-04-15 09:05:10 +08:00
tanghucheng c96f215ad5 * Fix bug #1780. 2022-04-15 08:08:48 +08:00
孙广明 27a70ba3e7 Merge branch 'sunhuawei_fixbug_21689' into 'master'
*Fix bug#21689.

See merge request easycorp/zentaopms!2952
2022-04-14 09:25:19 +00:00
王怡栋 1191d86cd4 Merge branch 'sprint/master_zhouxudong_17929' into 'master'
* Fix bug #17929.

See merge request easycorp/zentaopms!2947
2022-04-14 09:21:00 +00:00
孙华伟 50f753359c Update config.php 2022-04-14 09:20:01 +00:00
孙华伟 cc3d12bf7d *Optimize the code. 2022-04-14 17:17:43 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
孙华伟 d1db184695 *Fix bug#21689. 2022-04-14 17:11:32 +08:00
zhouxudong 40aaa97681 * Fix bug #17353. 2022-04-14 17:05:38 +08:00
孙广明 88cdfe304d Merge branch 'master_xieqiyu_6959' into 'master'
* Fix bug#6959.

See merge request easycorp/zentaopms!2939
2022-04-14 08:59:30 +00:00
zhouxudong 7fe4729a58 * Fix bug #17353. 2022-04-14 16:58:37 +08:00
孙广明 8a8377733b Merge branch 'master_xieqiyu_14454' into 'master'
Master xieqiyu 14454

See merge request easycorp/zentaopms!2950
2022-04-14 08:55:38 +00:00
孙广明 4ddc0f62cd Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.

See merge request easycorp/zentaopms!2944
2022-04-14 08:54:50 +00:00
孙广明 3cd615cdab Merge branch 'master_xieqiyu_15988' into 'master'
* Fix bug#15988.

See merge request easycorp/zentaopms!2930
2022-04-14 08:49:50 +00:00
xieqiyu a7c8401684 * Fix bug#14454. 2022-04-14 16:45:28 +08:00
孙广明 8fc8c8ec21 Merge branch 'sprint/unitTest_liumengyi_tree' into 'master'
* Add unit test of tree.

See merge request easycorp/zentaopms!2949
2022-04-14 08:17:26 +00:00
liumengyi 374562ebb9 * Add unit test of tree. 2022-04-14 16:15:54 +08:00
xieqiyu f971ded6fd * Fix bug#14454. 2022-04-14 16:13:18 +08:00
王怡栋 7436ec8ff7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *15336

See merge request easycorp/zentaopms!2933
2022-04-14 08:12:34 +00:00