Commit Graph

1870 Commits

Author SHA1 Message Date
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
songchenxuan
2b7e0ed4b3 *Finish task #45545. 2021-12-09 11:16:29 +08:00
songchenxuan
8b874bfbbc *Finish task #45545. 2021-12-09 09:20:45 +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
tianshujie
37a65b6789 * Fix bug #17259. 2021-12-08 16:10:09 +08:00
songchenxuan
95d51fdc09 *Finish task #45337. 2021-12-07 15:46:13 +08:00
xieqiyu
f22631ac2a * Fix bug#17113. 2021-12-07 14:56:10 +08:00
李玉春
9db701d207 Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17113.

See merge request easycorp/zentaopms!788
2021-12-06 07:18:39 +00: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
xieqiyu
0dc84860e9 * Fix bug#17113. 2021-12-06 11:55:46 +08:00
孙广明
7ebdc11ad1 Merge branch 'sprint/174_songchenxuan_17109' into 'master'
Sprint/174 songchenxuan 17109

See merge request easycorp/zentaopms!780
2021-12-06 03:16:28 +00:00
孙广明
ad1cc7c04f Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.

See merge request easycorp/zentaopms!774
2021-12-06 02:33:35 +00:00
hufangzhou
145fc2a461 * Fix bug #17074. 2021-12-06 10:27:51 +08:00
songchenxuan
eca98433cf *Fix bug #17109. 2021-12-06 09:52:56 +08:00
zhujinyong
5f3b5817c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-05 23:51:59 +08:00
zhujinyong
f6d7234156 * Fix bugs of api. 2021-12-05 23:51:27 +08:00
孙广明
acf95daf8a Merge branch 'sprint/174_hufangzhou_17065' into 'master'
* Fix bug #17065.

See merge request easycorp/zentaopms!768
2021-12-03 05:35:30 +00:00
hufangzhou
e76a988bbe * Fix bug #17065. 2021-12-03 13:25:51 +08:00
xieqiyu
47f1099039 * Fix bug#17061. 2021-12-03 13:09:22 +08:00
hufangzhou
dda03577c1 * Fix bug #17038. 2021-12-02 16:55:52 +08:00
李玉春
82f0d4f39c Merge branch 'sprint/174_hufangzhou_16975' into 'master'
* Fix bug #16975.

See merge request easycorp/zentaopms!739
2021-12-02 08:08:58 +00:00
hufangzhou
ed2efc053c * Fix bug #16975. 2021-12-02 14:05:35 +08:00
李玉春
22aff07db9 Merge branch 'sprint/174_songchenxuan_addcomment' into 'master'
* Add testcase batchEdit comment.

See merge request easycorp/zentaopms!720
2021-12-02 05:08:14 +00:00
李玉春
4c29226156 Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Fix bug #16987.

See merge request easycorp/zentaopms!723
2021-12-02 01:48:29 +00:00
mayue
07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
songchenxuan
13324bf430 * Add testcase batchEdit comment. 2021-12-02 08:45:27 +08:00
李玉春
fd0fb325fa Merge branch 'sprint/174_songchenxuan_16967' into 'master'
Sprint/174 songchenxuan 16967

See merge request easycorp/zentaopms!713
2021-12-02 00:34:22 +00:00
songchenxuan
0e97d5b419 * Fix bug #16967. 2021-12-02 08:17:13 +08:00