 王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
mayue
|
e52f9bc1d9
|
* Fix bug #14363.
|
2022-03-21 10:45:03 +08:00 |
|
|
Zongjun Lan
|
d03533c2fc
|
* fix bug #15274
|
2022-03-21 09:33:00 +08:00 |
|
|
zhouxudong
|
bf88ebd2e4
|
* Fix bug #16264.
|
2022-03-21 08:43:01 +08:00 |
|
|
李玉春
|
92045688e8
|
Merge branch 'pailei2_sunhuawei_11010' into 'pailei2'
*Fix bug #11010.
See merge request easycorp/zentaopms!2334
|
2022-03-17 08:38:22 +00:00 |
|
|
孙华伟
|
8f9b5c74e1
|
optimized code.
|
2022-03-17 15:47:52 +08:00 |
|
|
孙华伟
|
2c457f6013
|
optimized code.
|
2022-03-17 15:45:51 +08:00 |
|
|
孙华伟
|
f06ccb25da
|
*Fix new bug
|
2022-03-17 15:43:18 +08:00 |
|
|
孙华伟
|
3831ee1c15
|
*Fix bug #11010.
|
2022-03-17 13:36:49 +08:00 |
|
|
mayue
|
04525fe425
|
Optimize code.
|
2022-03-17 09:16:35 +08:00 |
|
|
mayue
|
f11f77d239
|
* Fix bug #20746.
|
2022-03-16 16:50:25 +08:00 |
|
|
zhouxin
|
ea4c5ec99b
|
Adjust code.
|
2022-03-07 00:59:32 +00:00 |
|
|
zhouxin
|
68650f4830
|
Finish task 49318.
|
2022-03-04 06:16:41 +00:00 |
|
|
xieqiyu
|
f937a6ac8f
|
* Fix bug of batch edit test case.
|
2022-03-01 15:22:07 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
xieqiyu
|
d4211b3f56
|
* Fix bug.
|
2022-03-01 14:58:32 +08:00 |
|
|
xieqiyu
|
74326a3331
|
* Optimize the code.
|
2022-03-01 14:40:00 +08:00 |
|
|
xieqiyu
|
9024dae71e
|
* Modify linked products when edit product.
|
2022-02-28 10:15:16 +08:00 |
|
|
xieqiyu
|
09f4270792
|
* Modify the module of test case when change product type.
|
2022-02-25 13:10:54 +08:00 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +08:00 |
|
|
zhengrunyu
|
22f29fd8d4
|
*Fix bug 49283
|
2022-02-18 10:40:09 +08:00 |
|
|
tianshujie
|
f7d58603fa
|
* Fix bug #18944,18947,18946.
|
2022-01-25 14:05:23 +08:00 |
|
|
xieqiyu
|
8092c5be0a
|
* Fix bug: normal product can not batch change module.
|
2022-01-18 13:11:22 +08:00 |
|
|
zhouxudong
|
ef97c04743
|
*Fix bug #13888.
|
2022-01-13 17:11:21 +08:00 |
|
|
王怡栋
|
be6ff893dd
|
* finish task #46219.
|
2021-12-24 09:58:27 +08:00 |
|
|
songchenxuan
|
1d7882d51f
|
*Finish task #46100.
|
2021-12-23 10:06:54 +08:00 |
|
|
songchenxuan
|
055df23f69
|
*Finish task #46100.
|
2021-12-22 17:32:44 +08:00 |
|
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
|
songchenxuan
|
2b7e0ed4b3
|
*Finish task #45545.
|
2021-12-09 11:16:29 +08:00 |
|
|
hufangzhou
|
25961617b3
|
* Adjust the code.
|
2021-12-08 17:26:12 +08:00 |
|
|
hufangzhou
|
68a534b137
|
* Fix bug #17269, bug #16975.
|
2021-12-08 17:16:22 +08:00 |
|
|
xieqiyu
|
f22631ac2a
|
* Fix bug#17113.
|
2021-12-07 14:56:10 +08:00 |
|
|
孙广明
|
e24ded1429
|
Merge branch 'sprint/174_hufangzhou_17116' into 'master'
* Fix bug #17116, bug #17117.
See merge request easycorp/zentaopms!789
|
2021-12-06 05:07:38 +00:00 |
|
|
hufangzhou
|
05d9182e31
|
* Fix bug #17116, bug #17117.
|
2021-12-06 12:09:15 +08:00 |
|
|
songchenxuan
|
eca98433cf
|
*Fix bug #17109.
|
2021-12-06 09:52:56 +08:00 |
|
|
hufangzhou
|
ed2efc053c
|
* Fix bug #16975.
|
2021-12-02 14:05:35 +08:00 |
|
|
tianshujie
|
e73b8d316c
|
* Fix bug #16973.
|
2021-12-01 14:15:20 +08:00 |
|
|
李玉春
|
dbc186a0c4
|
Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
# module/story/control.php
# module/story/view/header.html.php
# module/testcase/control.php
|
2021-11-30 07:44:47 +00:00 |
|
|
xieqiyu
|
888fbfe73b
|
* Code for task#45080.
|
2021-11-30 15:05:16 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
李玉春
|
80b3bcf938
|
Merge branch 'sprint/174_songchenxuan_fix_importfromlib_bug' into 'master'
* Fix bug testcase_importfromlib.
See merge request easycorp/zentaopms!645
|
2021-11-29 09:36:36 +00:00 |
|
|
孙广明
|
8d9fb81d9d
|
Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
# module/story/model.php
|
2021-11-29 07:26:45 +00:00 |
|
|
hufangzhou
|
883f87a19c
|
* Remove the unused code.
|
2021-11-29 15:24:46 +08:00 |
|
|
songchenxuan
|
28eaf804d4
|
* Fix bug testcase_importfromlib.
|
2021-11-29 14:30:50 +08:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
songchenxuan
|
eebabad646
|
* Fix task 45028.
|
2021-11-26 17:34:19 +08:00 |
|
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
|
孙广明
|
87ab1ecc76
|
Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.
See merge request easycorp/zentaopms!587
|
2021-11-22 07:12:13 +00:00 |
|
|
zhengrunyu
|
995ca51b88
|
*Finish task #16529.
|
2021-11-22 15:06:52 +08:00 |
|
|
tianshujie
|
c2ac079bbb
|
* Modify the case module problem.
|
2021-11-22 14:01:02 +08:00 |
|