 李玉春
|
ecf6797cb2
|
Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146
See merge request easycorp/zentaopms!2855
|
2022-04-11 06:14:39 +00:00 |
|
|
周旭东
|
36e1809e7c
|
Update control.php
|
2022-04-11 06:11:03 +00:00 |
|
|
xieqiyu
|
93cb0c08bf
|
* Fix bug#15146.
|
2022-04-11 14:07:49 +08:00 |
|
|
zhouxudong
|
5e5f3c50d1
|
* Fix bug #15146.
|
2022-04-11 09:50:59 +08:00 |
|
|
xieqiyu
|
ee5d43bea9
|
* Fix bug#18080.
|
2022-04-11 08:53:28 +08:00 |
|
|
朱金勇
|
1518796b03
|
Merge branch 'app_zry' into 'master'
* Fix bug 21591.
See merge request easycorp/zentaopms!2828
|
2022-04-08 06:05:36 +00:00 |
|
|
zhengrunyu
|
a7d7cca753
|
* Fix bug 21591.
|
2022-04-08 14:03:21 +08:00 |
|
|
zhouxudong
|
d60ce0159c
|
* Fix bug #17994.
|
2022-04-08 11:15:16 +08:00 |
|
|
xieqiyu
|
6618197691
|
* Fix bug#19196.
|
2022-04-08 09:48:11 +08:00 |
|
|
Zongjun Lan
|
bf35f0e20a
|
* remove line
|
2022-04-07 16:18:08 +08:00 |
|
|
Zongjun Lan
|
931c3ccc38
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-04-07 16:17:21 +08:00 |
|
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
|
Zongjun Lan
|
e9b834db10
|
* fix bug #21423
|
2022-04-07 13:08:21 +08:00 |
|
|
朱金勇
|
ecbbc59166
|
Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest
See merge request easycorp/zentaopms!2775
|
2022-04-06 09:09:27 +00:00 |
|
|
孙广明
|
bd895ca244
|
* Add project test and fix bug.
|
2022-04-06 16:01:06 +08:00 |
|
|
zenggang
|
8799957c73
|
* Fix bug#21218
|
2022-04-06 08:00:21 +00:00 |
|
|
xieqiyu
|
c4e9e00959
|
* Fix bug#13881.
|
2022-04-06 09:49:30 +08:00 |
|
|
王怡栋
|
3f74884813
|
* fix bug #21411.
|
2022-04-02 15:53:38 +08:00 |
|
|
王怡栋
|
adb3a7ea72
|
Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
# module/project/model.php
|
2022-04-02 07:33:24 +00:00 |
|
|
王怡栋
|
c18710567b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-02 14:44:44 +08:00 |
|
|
王怡栋
|
6edb5fe805
|
* fix bug #21413.
|
2022-04-02 14:44:18 +08:00 |
|
|
tanghucheng
|
8c81661d37
|
* Fix bug #21431.
|
2022-04-02 14:30:25 +08:00 |
|
|
tianshujie
|
b2e99c8dd4
|
* Modify the jump link mode.
|
2022-04-02 10:37:43 +08:00 |
|
|
tianshujie
|
b9dc9b118e
|
* Fix bug #19676.
|
2022-04-01 14:05:06 +08:00 |
|
|
xieqiyu
|
2a57f4fd28
|
* Fix bug#19665.
|
2022-03-31 16:08:33 +08:00 |
|
|
孙广明
|
4e2f0a3d86
|
Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.
See merge request easycorp/zentaopms!2666
|
2022-03-31 07:24:15 +00:00 |
|
|
孙广明
|
1746814316
|
Merge branch 'sprint/master_zhouxudong_17123' into 'master'
* Fix bug #17123.
See merge request easycorp/zentaopms!2672
|
2022-03-31 07:18:02 +00:00 |
|
|
zhouxudong
|
2b69acf643
|
* Fix bug #17123.
|
2022-03-31 14:55:04 +08:00 |
|
|
孙广明
|
5e8b3f2249
|
Merge branch 'fixbugs_zhouxin_21333' into 'master'
* Fix bug #21333.
See merge request easycorp/zentaopms!2668
|
2022-03-31 06:33:31 +00:00 |
|
|
zhouxin
|
3c1789a534
|
* Fix bug #21333.
|
2022-03-31 06:29:45 +00:00 |
|
|
zhouxin
|
bb47bfa04c
|
* Fix bug #21333.
|
2022-03-31 06:02:31 +00:00 |
|
|
xieqiyu
|
2ed1eedfcf
|
* Fix bug#19273.
|
2022-03-31 13:42:28 +08:00 |
|
|
孙广明
|
3d2de17fff
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.
See merge request easycorp/zentaopms!2648
|
2022-03-31 03:08:50 +00:00 |
|
|
孙广明
|
df2cda6e8b
|
Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083
See merge request easycorp/zentaopms!2653
|
2022-03-31 03:06:37 +00:00 |
|
|
zhouxudong
|
8efcc37f4b
|
* Fix bug #18083.
|
2022-03-31 11:02:59 +08:00 |
|
|
xieqiyu
|
0983c30e8d
|
* Fix bug#18083.
|
2022-03-30 17:26:17 +08:00 |
|
|
李玉春
|
a680dd14e7
|
Merge branch 'cyy_fixbug' into 'master'
* Fix bug #6971.
See merge request easycorp/zentaopms!2638
|
2022-03-30 09:12:48 +00:00 |
|
|
liyuchun
|
74d2ed5ea6
|
* Fix bug #11348.
|
2022-03-30 17:01:15 +08:00 |
|
|
caoyanyi
|
c2bc48fc38
|
* Fix bug #6971.
|
2022-03-30 13:29:38 +08:00 |
|
|
zenggang
|
5ceeb72655
|
* Finish task#51117
|
2022-03-30 02:43:34 +00:00 |
|
|
zhouxudong
|
a42d621269
|
* Fix bug #18083.
|
2022-03-30 09:13:13 +08:00 |
|
|
zhouxudong
|
e97eab6f68
|
* Fix bug #18083.
|
2022-03-30 08:50:14 +08:00 |
|
|
zhouxudong
|
a7f9fdca86
|
* Fix bug #18083.
|
2022-03-29 14:03:53 +08:00 |
|
|
xieqiyu
|
01a7b6391b
|
* Fix bug#11308,#20582.
|
2022-03-29 08:22:45 +08:00 |
|
|
李玉春
|
382e4493f1
|
Merge branch 'sprint/master_zhouxudong_11919' into 'master'
Sprint/master zhouxudong 11919
See merge request easycorp/zentaopms!2582
|
2022-03-28 08:12:30 +00:00 |
|
|
zhouxudong
|
5607b4f6c8
|
* Fix bug #11919.
|
2022-03-28 15:12:12 +08:00 |
|
|
xieqiyu
|
f72da77a5d
|
* Code for bug#20875.
|
2022-03-28 13:52:42 +08:00 |
|
|
zhouxudong
|
d689db05a7
|
* Fix bug #11919.
|
2022-03-28 13:10:11 +08:00 |
|
|
zhouxudong
|
5129df89d2
|
* Fix bug #11919.
|
2022-03-28 11:11:31 +08:00 |
|