 zhujinyong
|
2f3f356790
|
* Fix product param.
|
2022-04-19 08:36:02 +08:00 |
|
|
zhujinyong
|
25eb24fe7d
|
- Remove submodule.
|
2022-04-19 08:23:15 +08:00 |
|
|
zhujinyong
|
b8aea6f999
|
Merge branch 'sprint/sunhao/bug13445'
|
2022-04-18 17:18:22 +08:00 |
|
|
zhujinyong
|
864694faab
|
Merge branch 'sprint/sunhao/bug6910'
|
2022-04-18 17:16:17 +08:00 |
|
|
孙广明
|
e62097ee85
|
Merge branch 'autotest_ly' into 'master'
update projectproduct data
See merge request easycorp/zentaopms!3000
|
2022-04-18 09:12:06 +00:00 |
|
|
朱金勇
|
e61d35ba1d
|
Merge branch 'sprint/sunhao/bug21225' into 'master'
* bug #21225, bug #16589, support for adjusting submenu position in dropdown.
See merge request easycorp/zentaopms!2977
|
2022-04-18 09:11:55 +00:00 |
|
|
孙广明
|
478682aa42
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Modify unit test of branch.
See merge request easycorp/zentaopms!2999
|
2022-04-18 09:11:13 +00:00 |
|
|
liumengyi
|
6466b9dd0f
|
* Modify unit test of branch.
|
2022-04-18 17:05:49 +08:00 |
|
|
孙广明
|
95faa5d390
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add unit test of branch.
See merge request easycorp/zentaopms!2998
|
2022-04-18 09:01:51 +00:00 |
|
|
liumengyi
|
bdbf43362d
|
* Add unit test of branch.
|
2022-04-18 17:00:06 +08:00 |
|
|
孙广明
|
b89d214665
|
Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #20852.
See merge request easycorp/zentaopms!2994
|
2022-04-18 08:58:59 +00:00 |
|
|
孙广明
|
88a121686f
|
Merge branch 'fixbugs_zhouxin' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2996
|
2022-04-18 08:58:38 +00:00 |
|
|
zhouxin
|
6097b53514
|
* Fix bug.
|
2022-04-18 08:35:55 +00:00 |
|
|
liyuchun
|
6ce3a616db
|
* Fix bug #20852.
|
2022-04-18 15:56:26 +08:00 |
|
|
孙广明
|
878f310f3d
|
Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #21518.
See merge request easycorp/zentaopms!2979
|
2022-04-18 07:55:45 +00:00 |
|
|
李玉春
|
0cbc15a93c
|
Merge branch 'cyy_16738' into 'master'
* Fix bug #16738.
See merge request easycorp/zentaopms!2993
|
2022-04-18 07:55:20 +00:00 |
|
|
李玉春
|
5e008aab35
|
Merge branch 'zenggang_18642' into 'master'
Fix bug#18642,21572
See merge request easycorp/zentaopms!2991
|
2022-04-18 07:53:52 +00:00 |
|
|
李玉春
|
e13aed8c7c
|
Merge branch 'fixbug_sunjun_19262' into 'master'
*Fixbug_sunjun_19262
See merge request easycorp/zentaopms!2985
|
2022-04-18 07:52:30 +00:00 |
|
|
zenggang
|
b19b84e0c5
|
* Adjust code
|
2022-04-18 07:52:10 +00:00 |
|
|
caoyanyi
|
561ced0819
|
* Fix bug #16738.
|
2022-04-18 15:51:15 +08:00 |
|
|
孙广明
|
922f06724d
|
Merge branch 'dht_personnel' into 'master'
add productsonplan.ymal and personnel|projectstory unittest
See merge request easycorp/zentaopms!2987
|
2022-04-18 07:35:17 +00:00 |
|
|
孙广明
|
f14b947f2d
|
Merge branch 'sprint/mastr_zhouxudong_20867' into 'master'
* Fix bug #20867.
See merge request easycorp/zentaopms!2992
|
2022-04-18 07:35:03 +00:00 |
|
|
zhouxudong
|
89bfe585c8
|
* Fix bug #20867.
|
2022-04-18 15:31:00 +08:00 |
|
|
zenggang
|
1c8c50724d
|
* Fix bug#18642,21572
|
2022-04-18 07:25:46 +00:00 |
|
|
王怡栋
|
7155d82189
|
Merge branch 'sprint/fixbug_hufangzhou_21822' into 'master'
* Fix bug #21822.
See merge request easycorp/zentaopms!2988
|
2022-04-18 07:19:13 +00:00 |
|
|
王怡栋
|
0b1e89ea93
|
Merge branch 'sprint/fixbug_hufangzhou_11808' into 'master'
* Fix bug #11808.
See merge request easycorp/zentaopms!2984
|
2022-04-18 07:18:27 +00:00 |
|
|
王怡栋
|
610d0b435d
|
Merge branch 'sprint/fixbug_hufangzhou_21770' into 'master'
* Fix bug #21770.
See merge request easycorp/zentaopms!2972
|
2022-04-18 07:17:42 +00:00 |
|
|
孙广明
|
10d95940b6
|
Merge branch 'master_xieqiyu_14454' into 'master'
* Fix bug#14454.
See merge request easycorp/zentaopms!2981
|
2022-04-18 07:12:34 +00:00 |
|
|
孙广明
|
46e367c455
|
Merge branch 'master_xieqiyu_19379' into 'master'
* Fix bug#19379.
See merge request easycorp/zentaopms!2989
|
2022-04-18 07:12:12 +00:00 |
|
|
xieqiyu
|
205e3126ad
|
* Fix bug#19379.
|
2022-04-18 15:09:49 +08:00 |
|
|
hufangzhou
|
ddb4ab243a
|
* Remove the unused code.
|
2022-04-18 15:00:51 +08:00 |
|
|
hufangzhou
|
281fa51fc1
|
* Fix bug #21822.
|
2022-04-18 14:58:06 +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 |
|
|
denghongtao
|
81f91880b8
|
add productsonplan.ymal and personnel|projectstory unittest
|
2022-04-18 14:35:11 +08:00 |
|
|
王怡栋
|
4ea25a7725
|
* revert for setOpenApp method.
|
2022-04-18 14:26:23 +08:00 |
|
|
sunjun
|
0aa9ee7db1
|
*Fixbug_sunjun_19262
|
2022-04-18 14:21:57 +08:00 |
|
|
sunjun
|
efb1b2eee2
|
*Fixbug_sunjun_19262
|
2022-04-18 14:16:04 +08:00 |
|
|
hufangzhou
|
cc140db6a1
|
* Fix bug #11808.
|
2022-04-18 14:08:31 +08:00 |
|
|
zhouxudong
|
c449b53e4b
|
* Fix bug #20178.
|
2022-04-18 13:59:09 +08:00 |
|
|
xieqiyu
|
8ce20cb746
|
* Fix bug#14454.
|
2022-04-18 13:45:46 +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 |
|
|
liyuchun
|
c5eddbe19b
|
* Fix bug #21565.
|
2022-04-18 11:49:44 +08:00 |
|