 李玉春
|
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 |
|
|
tianshujie
|
4185f88f29
|
* Fix bug #18948,18836,18804.
|
2022-01-25 13:27:38 +08:00 |
|
|
tianshujie
|
bd99d3def9
|
* Realize the partial refresh function of the story card.
|
2022-01-20 17:35:49 +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 |
|
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
孙广明
|
3d3d4130dd
|
* Code for php8.0.
|
2021-12-29 16:59:54 +08:00 |
|
|
songchenxuan
|
32a4823ff6
|
*Fix classic mode branch bug.
|
2021-12-28 15:08:34 +08:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
songchenxuan
|
a5a0848a1c
|
*Fix classic mode branch bug.
|
2021-12-28 09:56: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
|
70612e93aa
|
*Fix bug #17563.
|
2021-12-20 13:55:22 +08:00 |
|
|
songchenxuan
|
8a0881aef4
|
*Finish task #45543.
|
2021-12-13 10:14:50 +08:00 |
|
|
朱金勇
|
40e1b04661
|
Merge branch 'sprint/176_songchenxuan_45545' into 'master'
Sprint/176 songchenxuan 45545
See merge request easycorp/zentaopms!880
|
2021-12-10 07:16:22 +00:00 |
|
|
songchenxuan
|
a175c752b8
|
*Finish task #45545.
|
2021-12-10 14:41:33 +08:00 |
|
|
songchenxuan
|
33efd7faf3
|
*Finish task #45539.
|
2021-12-10 11:34:18 +08:00 |
|
|
朱金勇
|
c5bce17ef3
|
Merge branch 'sprint/176_songchenxuan_45537' into 'master'
*Finish task #45337.
See merge request easycorp/zentaopms!871
|
2021-12-10 02:45:06 +00:00 |
|
|
songchenxuan
|
7d58d95af3
|
*Finish task #45545.
|
2021-12-10 09:15:55 +08:00 |
|