Commit Graph
1021 Commits
Author SHA1 Message Date
孙广明 d3aaac869c Merge branch 'sprint/scx_fixstorybug' into 'master'
* Fix bug #21992.

See merge request easycorp/zentaopms!3113
2022-04-25 09:27:24 +00:00
= 38137c5960 * Fix bug #21992. 2022-04-25 17:23:12 +08:00
lanzongjun c480a5203c * fix bug #16663 2022-04-25 13:52:37 +08:00
songchenxuan 124465c1b4 * Fix create substory bug. 2022-04-22 10:57:02 +08:00
孙广明 59f717ddb9 * Fix bug #21804. 2022-04-21 16:34:31 +08:00
孙华伟 d613f4ef2e *Optimize the code. 2022-04-20 15:41:22 +08:00
孙华伟 924b03bab4 * Fix bug #15207. 2022-04-20 15:29:49 +08:00
王怡栋 2478e067f4 * code for bug #15386. 2022-04-15 13:43:45 +08:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +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 dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
王怡栋 a9809c35aa * code for bug #20823. 2022-04-13 10:01:36 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
hufangzhou 5745d42b1f * Fix bug #21646. 2022-04-11 16:10:32 +08:00
zhouxin 30af3cd8ee * Fix bug #20812. 2022-04-08 07:33:19 +00:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
李玉春 69a8379657 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2806
2022-04-07 09:09:04 +00:00
tianshujie 209f8c9655 * Add comment. 2022-04-07 17:06:42 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
hufangzhou 19e8bf99ea * Fix bug for lite. 2022-04-07 16:46:38 +08:00
hufangzhou 85eb91ce9c * Fix bug of split story. 2022-04-07 16:40:30 +08:00
hufangzhou fe7158cf3a * Fix bug #21525. 2022-04-07 14:32:44 +08:00
孙华伟 a10b23a5c0 *Fix bug#21514. 2022-04-06 15:24:00 +08:00
李玉春 8a687ef1d5 Merge branch 'sunhuawei_fixbug_20335' into 'master'
Sunhuawei fixbug 20335

See merge request easycorp/zentaopms!2702
2022-04-02 09:10:04 +00:00
孙华伟 1612f6aabd Optimize the code. 2022-04-02 17:08:34 +08:00
李玉春 46a965b02b Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.

See merge request easycorp/zentaopms!2662
2022-04-02 06:05:51 +00:00
caoyanyi 59efd44767 * Adjust codes. 2022-04-02 14:03:23 +08:00
李玉春 d993fe3734 Merge branch 'sunhuawei_fixbug_21235' into 'master'
Sunhuawei fixbug 21235

See merge request easycorp/zentaopms!2665
2022-04-01 09:22:07 +00:00
mayue d4eb0ef746 * Fix bug #16601. 2022-04-01 14:02:22 +08:00
孙广明 67e3a3b4c4 Merge branch 'sunhuawei_fixbug_15989' into 'master'
Sunhuawei fixbug 15989

See merge request easycorp/zentaopms!2681
2022-04-01 02:50:22 +00:00
songchenxuan d424737aff * Fix change story bug . 2022-04-01 10:42:05 +08:00
孙广明 1d7982f458 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2694
2022-04-01 02:15:55 +00:00
Zongjun Lan 0f7022d102 * fix bug #20310 2022-04-01 09:06:01 +08:00
孙华伟 123640718d Optimize the code. 2022-04-01 08:53:02 +08:00
孙华伟 3d06589695 *Optimize the code. 2022-03-31 17:13:15 +08:00
tianshujie e655e4fad1 * Fix bug #18035. 2022-03-31 15:55:49 +08:00
孙华伟 14efe1705b Optimize the code. 2022-03-31 13:42:49 +08:00
孙华伟 19ed227a85 Optimize the code. 2022-03-31 13:37:23 +08:00
caoyanyi 760b816acd * Fix bug #14928. 2022-03-31 11:02:27 +08:00
孙华伟 838dbfc9f5 *Optimize the code. 2022-03-31 10:20:47 +08:00
孙华伟 5e26ae3c54 *Fix bug#21235. 2022-03-31 10:17:52 +08:00
孙华伟 434e425a1b *Fix bug#15989 2022-03-29 11:05:13 +08:00
朱金勇 c6077f7c40 Merge branch 'sgm_storytest' into 'master'
* Add story test.

See merge request easycorp/zentaopms!2521
2022-03-24 09:21:41 +00:00
孙广明 d8cfabd4a7 * Add story test. 2022-03-24 17:15:18 +08: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
朱金勇 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