 李玉春
|
eef0da7fd0
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2517
|
2022-03-24 09:16:36 +00:00 |
|
|
tianshujie
|
f5bc1f99a2
|
* Modify the code.
|
2022-03-24 16:53:54 +08:00 |
|
|
tianshujie
|
c9c1573a2d
|
* Fix bug #20523.
|
2022-03-24 14:40:38 +08:00 |
|
|
zenggang
|
dd5cab2011
|
* Finish task#51184,51176,51141
|
2022-03-24 06:21:10 +00:00 |
|
|
孙广明
|
c08b31e854
|
Merge branch 'sunhuawei_fixbug_11441' into 'master'
*Fix bug#11441.
See merge request easycorp/zentaopms!2479
|
2022-03-23 08:47:00 +00:00 |
|
|
孙华伟
|
ba1c42d0b5
|
*Fix bug#11441.
|
2022-03-23 14:54:35 +08:00 |
|
|
tianshujie
|
5e7034e5c1
|
* Fix bug #20653.
|
2022-03-23 14:11:25 +08:00 |
|
|
李玉春
|
64e9667a1f
|
Merge branch 'sprint/master_zhouxudong_16718' into 'master'
* Fix bug #16718.
See merge request easycorp/zentaopms!2458
|
2022-03-22 08:55:17 +00:00 |
|
|
zhouxudong
|
e827209fe0
|
* Fix bug #16718.
|
2022-03-22 16:37:09 +08:00 |
|
|
朱金勇
|
68dc7ba793
|
Merge branch 'app_zhengrunyu' into 'master'
*Fix api .
See merge request easycorp/zentaopms!2454
|
2022-03-22 08:27:17 +00:00 |
|
|
zhengrunyu
|
5108aab254
|
*Fix api .
|
2022-03-22 16:19:32 +08:00 |
|
|
李玉春
|
56e4317e23
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2447
|
2022-03-22 07:55:27 +00:00 |
|
|
tianshujie
|
bbe26af087
|
* Fix bug #20977.
|
2022-03-22 15:38:54 +08:00 |
|
|
朱金勇
|
f523d8f121
|
Merge branch 'sgm_storytest' into 'master'
* Add story test and fix bug.
See merge request easycorp/zentaopms!2439
|
2022-03-22 06:09:37 +00:00 |
|
|
孙广明
|
fd5d14033a
|
* Add story test and fix bug.
|
2022-03-22 14:07:42 +08:00 |
|
|
caoyanyi
|
1d68afd421
|
* Modify story create error.
|
2022-03-22 13:34:37 +08:00 |
|
|
王怡栋
|
e4c3911d5f
|
* fix bug for setstage.
|
2022-03-22 09:36:07 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
|
mayue
|
f42471337f
|
* Fix bug #6960.
|
2022-03-18 11:01:55 +08:00 |
|
|
李玉春
|
59850d5e8f
|
Merge branch 'pailei2_sunhuawei_50728' into 'pailei2'
*Fix bug#19716
See merge request easycorp/zentaopms!2252
|
2022-03-17 05:36:01 +00:00 |
|
|
tianshujie
|
e8d2aa6b3e
|
* Modify variable name.
|
2022-03-17 11:13:04 +08:00 |
|
|
tianshujie
|
5c90c8677d
|
* Fix bug #19061.
|
2022-03-17 10:23:16 +08:00 |
|
|
songchenxuan
|
ed6e82f02f
|
*Close a story.
|
2022-03-17 10:11:35 +08:00 |
|
|
孙华伟
|
8ac07ad424
|
更新module/story/control.php
|
2022-03-17 01:10:43 +00:00 |
|
|
孙广明
|
52193bd9ee
|
Merge branch 'pailei_sunjun_50784' into 'pailei2'
fixbug #18669
See merge request easycorp/zentaopms!2304
|
2022-03-16 06:32:04 +00:00 |
|
|
sunjun
|
ef285a4869
|
fixbug #18669
|
2022-03-16 14:27:49 +08:00 |
|
|
孙广明
|
e2eb8999e5
|
Merge branch 'pailei2_zhouxin_50789' into 'pailei2'
Pailei2 zhouxin 50789
See merge request easycorp/zentaopms!2294
|
2022-03-16 05:28:51 +00:00 |
|
|
王怡栋
|
371b7a7d7d
|
Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2'
* Fix bug #17944.
See merge request easycorp/zentaopms!2292
|
2022-03-16 05:04:22 +00:00 |
|
|
zhouxin
|
f6a7577749
|
Fix bug #18306.
|
2022-03-16 01:39:05 +00:00 |
|
|
孙华伟
|
d73ce9b57a
|
Optimize the code.
|
2022-03-15 08:56:43 +00:00 |
|
|
tianshujie
|
0fde764778
|
* Fix bug #17944.
|
2022-03-15 10:27:27 +08:00 |
|
|
zhouxin
|
2c347bccb8
|
Fix bug #20749.
|
2022-03-15 02:14:16 +00:00 |
|
|
孙华伟
|
8c58e0ef16
|
*Fix bug#19716
|
2022-03-14 17:24:49 +08:00 |
|
|
zhouxin
|
767d6efa03
|
Fix bug #50409.
|
2022-03-14 05:27:23 +00:00 |
|
|
hufangzhou
|
c402f35eda
|
* Fix bug #20704.
|
2022-03-14 10:08:25 +08:00 |
|
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
hufangzhou
|
57bbeeddd7
|
* Remove the unused code.
|
2022-03-10 11:01:21 +08:00 |
|
|
tianshujie
|
a0e7c613f3
|
* Finish task #50370.
|
2022-03-10 10:11:56 +08:00 |
|
|
tianshujie
|
a7d66c5fae
|
* Fix bug #20572.
|
2022-03-10 10:05:34 +08:00 |
|
|
tianshujie
|
ffd4850a9d
|
* Finish task #20479.
|
2022-03-09 16:17:32 +08:00 |
|
|
tianshujie
|
1afb4315be
|
* Finish task #50389.
|
2022-03-09 16:06:41 +08:00 |
|
|
孙广明
|
4c218d7a69
|
Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888
See merge request easycorp/zentaopms!2155
|
2022-03-09 06:41:53 +00:00 |
|
|
xieqiyu
|
4ba238cd27
|
* Modify review code.
|
2022-03-09 14:36:50 +08:00 |
|
|
mayue
|
9f38f5cd10
|
* Fix bug #50240.
|
2022-03-09 13:27:42 +08:00 |
|
|
xieqiyu
|
139ea1e04a
|
* Modify review code.
|
2022-03-09 11:17:36 +08:00 |
|
|
tianshujie
|
57da5c00a9
|
* Fix bug #20503.
|
2022-03-09 10:47:16 +08:00 |
|
|
xieqiyu
|
a307d49c7f
|
* Modify batch create story action form start ID.
|
2022-03-09 10:31:24 +08:00 |
|
|
zhangzilong
|
590ba16d6a
|
* Code for task #49888.
|
2022-03-09 09:32:18 +08:00 |
|
|
孙广明
|
382c57984e
|
Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107
See merge request easycorp/zentaopms!2151
|
2022-03-09 01:14:21 +00:00 |
|