 liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
zhouxudong
|
53152cbeb0
|
* Fix bug #12671.
|
2022-03-21 13:36:58 +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 |
|
|
朱金勇
|
678e438a27
|
Merge branch 'sprint/pailei2_zhouxudong_20112' into 'pailei2'
* Fix bug #20112.
See merge request easycorp/zentaopms!2368
|
2022-03-18 05:38:29 +00:00 |
|
|
zhouxudong
|
995c88a678
|
* Fix bug #20112.
|
2022-03-18 11:57:22 +08:00 |
|
|
李玉春
|
071f23375d
|
Merge branch 'pailei2_mayue_bug#14184' into 'pailei2'
* Fix bug #14184.
See merge request easycorp/zentaopms!2358
|
2022-03-18 03:29:31 +00:00 |
|
|
mayue
|
034daa3bb6
|
* Fix bug #14184.
|
2022-03-18 09:43:22 +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 |
|
|
孙华伟
|
ae1bc57c73
|
optimized code.
|
2022-03-17 16:11:53 +08:00 |
|
|
孙华伟
|
8f9b5c74e1
|
optimized code.
|
2022-03-17 15:47:52 +08:00 |
|
|
mayue
|
e303b1c45b
|
* Fix bug #15289.
|
2022-03-17 15:47:16 +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 |
|
|
mayue
|
f48f09fa0d
|
Optimize code.
|
2022-03-17 14:52:02 +08:00 |
|
|
mayue
|
121dc576fb
|
* Fix bug #14363.
|
2022-03-17 14:37:24 +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 |
|
|
王怡栋
|
8053903ba2
|
* code for task #20556.
|
2022-03-11 10:03:48 +08:00 |
|
|
李玉春
|
0ff0403825
|
Merge branch 'sprint/pailei2_zhouxudong_19823' into 'pailei2'
* Fix bug #19823.
See merge request easycorp/zentaopms!2140
|
2022-03-08 06:39:13 +00:00 |
|
|
zhouxudong
|
65554fcadb
|
* Fix bug #19823.
|
2022-03-08 11:23:31 +08:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +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 |
|
|
liumengyi
|
5ccacc2138
|
* Fix bug #20318.
|
2022-03-04 13:05:01 +08:00 |
|
|
liumengyi
|
54d4ea2fc6
|
* Fix bug #20131.
|
2022-03-03 16:40:29 +08: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 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
xieqiyu
|
09f4270792
|
* Modify the module of test case when change product type.
|
2022-02-25 13:10:54 +08:00 |
|
|
xieqiyu
|
d15a0ea9b2
|
* Modify module of testcase when change product type.
|
2022-02-24 17:07:54 +08:00 |
|
|
liumengyi
|
9bd39c1e98
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:44:11 +08:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
zhouxudong
|
02a79e87d7
|
* Fix bug #19363.
|
2022-02-24 13:11:45 +08:00 |
|
|
zhujinyong
|
61e790f1ff
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-23 14:04:48 +08:00 |
|
|
zhujinyong
|
4dbd9fcae5
|
* Fix bug: = ? return.
|
2022-02-23 14:04:11 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +08:00 |
|
|
songchenxuan
|
73faff3b7d
|
*Delete and Add langs.
|
2022-02-18 15:33:58 +08:00 |
|
|
zhengrunyu
|
22f29fd8d4
|
*Fix bug 49283
|
2022-02-18 10:40:09 +08:00 |
|
|
zhengrunyu
|
aa444513d6
|
* Finish task 49283.
|
2022-02-17 16:13:24 +08:00 |
|
|
tianshujie
|
0f12cdd8aa
|
* Adjust style pager.
|
2022-01-26 13:59:24 +08:00 |
|
|
tianshujie
|
f7d58603fa
|
* Fix bug #18944,18947,18946.
|
2022-01-25 14:05:23 +08:00 |
|