 孙广明
|
486f7a35ce
|
Merge branch 'sprint/unitTest_liumengyi_tree' into 'master'
* Add unit test of tree.
See merge request easycorp/zentaopms!2924
|
2022-04-13 09:08:09 +00:00 |
|
|
liumengyi
|
4157e3dea4
|
* Add unit test of tree.
|
2022-04-13 17:06:05 +08:00 |
|
|
王怡栋
|
4cd6cfc35b
|
Merge branch 'sprint/fixbug_hufangzhou_action' into 'master'
* Modify the product field type of zt_action and zt_effort because the current...
See merge request easycorp/zentaopms!2923
|
2022-04-13 09:04:23 +00:00 |
|
|
hufangzhou
|
80df716a0a
|
* Modify the product field type of zt_action and zt_effort because the current length is not enough.
|
2022-04-13 16:46:55 +08:00 |
|
|
孙广明
|
ec238a9b4e
|
Merge branch 'master_xieqiyu_20006' into 'master'
* Fix bug#20006.
See merge request easycorp/zentaopms!2917
|
2022-04-13 08:22:44 +00:00 |
|
|
孙广明
|
96aac66684
|
Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.
See merge request easycorp/zentaopms!2914
|
2022-04-13 08:22:07 +00:00 |
|
|
孙广明
|
ec3d957536
|
Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.
See merge request easycorp/zentaopms!2911
|
2022-04-13 08:21:38 +00:00 |
|
|
王怡栋
|
97f9ee3297
|
Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.
See merge request easycorp/zentaopms!2922
|
2022-04-13 08:05:44 +00:00 |
|
|
zhouxin
|
6e6deaa462
|
* Fix bug #21374.
|
2022-04-13 07:59:57 +00:00 |
|
|
王怡栋
|
fb96e23a7f
|
Merge branch 'sprint/master_zhouxudong_14189' into 'master'
* Fix bug #14189.
See merge request easycorp/zentaopms!2919
|
2022-04-13 07:53:28 +00:00 |
|
|
王怡栋
|
a08989d11a
|
Merge branch 'sprint/master_zhouxudong_17994'
|
2022-04-13 15:52:50 +08:00 |
|
|
王怡栋
|
a8983445c8
|
Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
# module/bug/model.php
# module/task/model.php
|
2022-04-13 07:52:03 +00:00 |
|
|
zhouxudong
|
61198c8486
|
* Fix bug #14189.
|
2022-04-13 15:40:09 +08:00 |
|
|
周旭东
|
e9e20ffae0
|
Update control.php
|
2022-04-13 07:24:55 +00:00 |
|
|
王怡栋
|
c273c3aefe
|
Merge branch 'sprint/master_zhouxudong_21700' into 'master'
* Fix bug #21700.
See merge request easycorp/zentaopms!2904
|
2022-04-13 07:19:18 +00:00 |
|
|
xieqiyu
|
f5b55eecfe
|
* Fix bug#20006.
|
2022-04-13 15:03:57 +08:00 |
|
|
王怡栋
|
ac0f89247c
|
Merge branch 'sprint/tianshujie_bug17551' into 'master'
Sprint/tianshujie bug17551
See merge request easycorp/zentaopms!2916
|
2022-04-13 07:02:40 +00:00 |
|
|
tianshujie
|
d41521bbcc
|
* Fix bug #21699.
|
2022-04-13 14:53:33 +08:00 |
|
|
王怡栋
|
6e9c3a8afc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293
See merge request easycorp/zentaopms!2915
|
2022-04-13 06:49:48 +00:00 |
|
|
Zongjun Lan
|
e13c17216a
|
* modify sql
|
2022-04-13 14:48:05 +08:00 |
|
|
tianshujie
|
b9670165ab
|
* Fix bug #21653.
|
2022-04-13 14:44:01 +08:00 |
|
|
Zongjun Lan
|
0aa1cc9ad9
|
* fix bug *21293
|
2022-04-13 14:39:33 +08:00 |
|
|
tianshujie
|
f612dcd079
|
* Fix bug 17551.
|
2022-04-13 14:27:53 +08:00 |
|
|
tianshujie
|
e681135a3a
|
* Fix bug #21643.
|
2022-04-13 14:22:32 +08:00 |
|
|
xieqiyu
|
573fa80df6
|
* Fix bug#13127.
|
2022-04-13 14:00:25 +08:00 |
|
|
王怡栋
|
940659bc12
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21576.
See merge request easycorp/zentaopms!2913
|
2022-04-13 05:57:24 +00:00 |
|
|
王怡栋
|
fd4e6bc2bc
|
Merge branch 'sprint/fixbug_hufangzhou_15656' into 'master'
* Fix bug #15656.
See merge request easycorp/zentaopms!2907
|
2022-04-13 05:39:42 +00:00 |
|
|
王怡栋
|
1c52566984
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *20169
See merge request easycorp/zentaopms!2905
|
2022-04-13 05:37:49 +00:00 |
|
|
王怡栋
|
3c0b0a6c31
|
Merge branch 'sprint/tianshujie_bug17551' into 'master'
* Fix bug #17551.
See merge request easycorp/zentaopms!2912
|
2022-04-13 05:37:09 +00:00 |
|
|
tianshujie
|
90a1fea2d8
|
* Fix bug #17551.
|
2022-04-13 13:35:02 +08:00 |
|
|
xieqiyu
|
22b629b707
|
* Fix bug#21382.
|
2022-04-13 13:15:08 +08:00 |
|
|
李玉春
|
ebab24c97b
|
Merge branch 'sprint/master_zhouxudong_14891' into 'master'
* Fix bug #14891.
See merge request easycorp/zentaopms!2908
|
2022-04-13 03:29:06 +00:00 |
|
|
zhouxudong
|
20a9051148
|
* Fix bug #14891.
|
2022-04-13 11:23:29 +08:00 |
|
|
hufangzhou
|
18293e3e0d
|
* Fix bug #15656.
|
2022-04-13 11:19:20 +08:00 |
|
|
周旭东
|
4e7fcd1ad1
|
Update model.php
|
2022-04-13 03:08:48 +00:00 |
|
|
zhouxudong
|
dcdbf60bdf
|
* Fix bug #17994.
|
2022-04-13 11:07:22 +08:00 |
|
|
zhouxudong
|
37337bdb68
|
* Fix bug #17994.
|
2022-04-13 10:59:25 +08:00 |
|
|
tanghucheng
|
0c2c898c01
|
* Fix bug #21576.
|
2022-04-13 10:46:44 +08:00 |
|
|
zhouxudong
|
19f499e121
|
* Fix bug #17994.
|
2022-04-13 10:36:39 +08:00 |
|
|
Zongjun Lan
|
486295dcc1
|
* fix bug *20169
|
2022-04-13 10:28:29 +08:00 |
|
|
朱金勇
|
a534c56793
|
Merge branch 'autotest_ly' into 'master'
Autotest ly
See merge request easycorp/zentaopms!2901
|
2022-04-13 02:11:33 +00:00 |
|
|
朱金勇
|
d2dcdd6a91
|
Merge branch 'zry_app' into 'master'
* Fix api for bug to story.
See merge request easycorp/zentaopms!2900
|
2022-04-13 02:11:16 +00:00 |
|
|
zhouxudong
|
7ac526401d
|
* Fix bug #21700.
|
2022-04-13 10:08:53 +08:00 |
|
|
孙广明
|
64df7ac5c0
|
Merge branch 'sunhuawei_fixbug_21668' into 'master'
*Fix bug#21668
See merge request easycorp/zentaopms!2903
|
2022-04-13 02:07:02 +00:00 |
|
|
王怡栋
|
f6b236aed7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-13 10:02:05 +08:00 |
|
|
王怡栋
|
a9809c35aa
|
* code for bug #20823.
|
2022-04-13 10:01:36 +08:00 |
|
|
孙华伟
|
df57c95636
|
*Fix bug#21668
|
2022-04-13 09:59:37 +08:00 |
|
|
王怡栋
|
f9e8a8d69f
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21614.
See merge request easycorp/zentaopms!2896
|
2022-04-13 01:55:56 +00:00 |
|
|
王怡栋
|
9529d136a8
|
Merge branch 'sprint/tianshujie_bug17280' into 'master'
Sprint/tianshujie bug17280
See merge request easycorp/zentaopms!2902
|
2022-04-13 01:54:16 +00:00 |
|
|
tianshujie
|
2e5b43979e
|
* Fix bug #21641.
|
2022-04-13 09:51:40 +08:00 |
|