 zhouxudong
|
89bfe585c8
|
* Fix bug #20867.
|
2022-04-18 15:31:00 +08:00 |
|
|
王怡栋
|
9d8e96b829
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-18 14:54:42 +08:00 |
|
|
王怡栋
|
c2e9328d77
|
* adjust for refresh page.
|
2022-04-18 14:54:18 +08:00 |
|
|
孙广明
|
317b12da7b
|
Merge branch 'sprint/master_zhouxudong_20178' into 'master'
Sprint/master zhouxudong 20178
See merge request easycorp/zentaopms!2982
|
2022-04-18 06:49:50 +00:00 |
|
|
孙广明
|
af6b44bd5b
|
Merge branch 'autotest_ly' into 'master'
Autotest ly
See merge request easycorp/zentaopms!2986
|
2022-04-18 06:49:16 +00:00 |
|
|
zhouxudong
|
36946a8fb1
|
* Fix bug #20178.
|
2022-04-18 14:47:04 +08:00 |
|
|
王怡栋
|
4ea25a7725
|
* revert for setOpenApp method.
|
2022-04-18 14:26:23 +08:00 |
|
|
zhouxudong
|
c449b53e4b
|
* Fix bug #20178.
|
2022-04-18 13:59:09 +08:00 |
|
|
王怡栋
|
a1e72ace5e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-18 13:26:47 +08:00 |
|
|
王怡栋
|
323f7366ba
|
* code for bug #21020.
|
2022-04-18 13:26:25 +08:00 |
|
|
孙广明
|
226ccc8c69
|
Merge branch 'autotest_ly' into 'master'
update branch data
See merge request easycorp/zentaopms!2980
|
2022-04-18 05:21:56 +00:00 |
|
|
zhouxudong
|
532920579e
|
* Fix bug #20178.
|
2022-04-18 13:20:44 +08:00 |
|
|
孙广明
|
6703d17651
|
Merge branch 'fixbug_sunjun_qijian' into 'master'
Fixbug sunjun qijian
See merge request easycorp/zentaopms!2970
|
2022-04-18 05:20:23 +00:00 |
|
|
王怡栋
|
0d0fcb0c2e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-18 11:30:31 +08:00 |
|
|
李玉春
|
4334eca80d
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2978
|
2022-04-18 03:30:09 +00:00 |
|
|
王怡栋
|
a481ba2959
|
* adjust for check priv.
|
2022-04-18 11:26:21 +08:00 |
|
|
tianshujie
|
ab1ad4051b
|
* Fix bug #21682.
|
2022-04-18 11:21:54 +08:00 |
|
|
zhouxudong
|
9f50c3abaa
|
* Fix bug #20178.
|
2022-04-18 11:18:33 +08:00 |
|
|
孙广明
|
df7235355c
|
Merge branch 'sunhuawei_fixbug_20316' into 'master'
* Fix bug #20316.
See merge request easycorp/zentaopms!2976
|
2022-04-18 02:59:35 +00:00 |
|
|
孙华伟
|
a5d6663342
|
* Fix bug #20316.
|
2022-04-18 10:55:42 +08:00 |
|
|
tianshujie
|
685a583d99
|
* Fix bug #17551.
|
2022-04-18 10:50:50 +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 |
|
|
liyang
|
2c8b8ae31a
|
update ztest
|
2022-04-17 17:54:26 +08:00 |
|
|
liyang
|
543b7a7189
|
add stakeholder test
|
2022-04-17 17:53:20 +08:00 |
|
|
liyang
|
01789cc58a
|
update branch data
|
2022-04-17 16:29:36 +08:00 |
|
|
sunjun
|
ccca03fb97
|
*Fixbug_sunjun_qijian
|
2022-04-16 22:52:43 +08:00 |
|
|
sunjun
|
db0fd23155
|
*Fixbug_sunjun_qijian
|
2022-04-16 22:46:42 +08: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 |
|