 李玉春
|
2ff4571f77
|
Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170'
* Fix bug #16169, bug#16179.
See merge request easycorp/zentaopms!412
|
2021-11-11 08:32:14 +00:00 |
|
|
hufangzhou
|
a8f6836d46
|
* Remove the unused code.
|
2021-11-11 16:30:41 +08:00 |
|
|
李玉春
|
c8b1eaef62
|
Merge branch 'sprint/170_mayue_16191' into 'sprint/170'
* Fix bug #16191.
See merge request easycorp/zentaopms!414
|
2021-11-11 08:19:38 +00:00 |
|
|
李玉春
|
2c296a129b
|
Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170'
* Fix bug #16190.
See merge request easycorp/zentaopms!411
|
2021-11-11 08:09:59 +00:00 |
|
|
mayue
|
f8eebdf678
|
* Fix bug #16191.
|
2021-11-11 16:08:03 +08:00 |
|
|
tianshujie
|
7fb8685e04
|
* Fix the problem of reporting errors in batch editing stories.
|
2021-11-11 16:01:51 +08:00 |
|
|
李玉春
|
81f49bd434
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Fix bug #16191.
See merge request easycorp/zentaopms!413
|
2021-11-11 08:01:22 +00:00 |
|
|
mayue
|
c9996a26ec
|
* Fix bug #16191.
|
2021-11-11 15:54:22 +08:00 |
|
|
tianshujie
|
fd9423c737
|
* Remove useless code.
|
2021-11-11 15:42:42 +08:00 |
|
|
hufangzhou
|
4163d17335
|
* Fix bug #16169, bug#16179.
|
2021-11-11 15:31:37 +08:00 |
|
|
tianshujie
|
2eb1a00881
|
* Fix bug #16190.
|
2021-11-11 15:25:29 +08:00 |
|
|
tianshujie
|
4f4b683dbd
|
* Fix bug #16190.
|
2021-11-11 15:20:01 +08:00 |
|
|
李玉春
|
15196aca58
|
Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170'
* Fix the problem of reporting errors on the batch editing story page.
See merge request easycorp/zentaopms!407
|
2021-11-11 06:50:43 +00:00 |
|
|
李玉春
|
a02ebf672e
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!410
|
2021-11-11 06:49:40 +00:00 |
|
|
tianshujie
|
f6f75dace2
|
* Modify the issue of batch and zero editing stories.
|
2021-11-11 14:49:34 +08:00 |
|
|
mayue
|
dfa82c09db
|
* Finish task #43892.
|
2021-11-11 14:48:02 +08:00 |
|
|
mayue
|
67ace49bea
|
* Finish task #43892.
|
2021-11-11 14:39:21 +08:00 |
|
|
李玉春
|
f90072b45a
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix the trunk display problem when execution manage products.
See merge request easycorp/zentaopms!409
|
2021-11-11 06:38:25 +00:00 |
|
|
李玉春
|
26fec84d76
|
Merge branch 'sprint/170_xieqiyu_43890' into 'sprint/170'
* Finish task#43890.
See merge request easycorp/zentaopms!408
|
2021-11-11 06:20:29 +00:00 |
|
|
tianshujie
|
5f6bc547a3
|
* Fix the problem of obtaining plan.
|
2021-11-11 14:15:06 +08:00 |
|
|
tianshujie
|
4940500fe1
|
* Fix the trunk display problem when execution manage products.
|
2021-11-11 13:59:52 +08:00 |
|
|
mayue
|
af83e8a639
|
* Resolve display of list Settings #43892.
|
2021-11-11 13:56:02 +08:00 |
|
|
xieqiyu
|
b1098e7040
|
* Finish task#43890.
|
2021-11-11 13:53:24 +08:00 |
|
|
tianshujie
|
edd64950ab
|
* Fix the problem of reporting errors on the batch editing story page.
|
2021-11-11 13:44:27 +08:00 |
|
|
孙广明
|
8e1b542ca3
|
Merge branch 'sprint/170_leiyong_44172' into 'sprint/170'
Sprint/170 leiyong 44172
See merge request easycorp/zentaopms!406
|
2021-11-11 05:37:40 +00:00 |
|
|
leiyong
|
f20bb5bf9c
|
* Conflict resolution.
|
2021-11-11 05:29:48 +00:00 |
|
|
leiyong
|
088a6374df
|
* Finish task#44172,task#44273.
|
2021-11-11 05:26:27 +00:00 |
|
|
liyuchun
|
c606215adb
|
Merge branch 'sprint/170_hufangzhou_16092' into sprint/170
|
2021-11-11 12:27:07 +08:00 |
|
|
李玉春
|
efa8f93a72
|
Merge branch 'sprint/170' into 'sprint/170_hufangzhou_16092'
# Conflicts:
# module/product/model.php
|
2021-11-11 05:08:31 +00:00 |
|
|
hufangzhou
|
7d9793eaa3
|
* Modify the get by search.
|
2021-11-11 11:29:54 +08:00 |
|
|
李玉春
|
e3549fe24c
|
Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170'
* Finish task #43909.
See merge request easycorp/zentaopms!403
|
2021-11-11 03:28:39 +00:00 |
|
|
liumengyi
|
c4c2356bf3
|
* Finish task #43909.
|
2021-11-11 11:25:53 +08:00 |
|
|
李玉春
|
39f712f005
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix code errors.
See merge request easycorp/zentaopms!402
|
2021-11-11 03:23:04 +00:00 |
|
|
tianshujie
|
fbf487dce8
|
* Fix code errors.
|
2021-11-11 11:19:06 +08:00 |
|
|
孙广明
|
eb62dcead9
|
Merge branch 'sprint/170_zhengrunyu_44163' into 'sprint/170'
*Finish task #44163.
See merge request easycorp/zentaopms!399
|
2021-11-11 03:16:43 +00:00 |
|
|
hufangzhou
|
8e9f8b860e
|
* Fix bug #16092.
|
2021-11-11 11:07:23 +08:00 |
|
|
zhengrunyu
|
be094287b6
|
Finish task #44163.
|
2021-11-11 11:03:20 +08:00 |
|
|
李玉春
|
802ff05157
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix the problem of judging product permissions.
See merge request easycorp/zentaopms!397
|
2021-11-11 02:56:41 +00:00 |
|
|
李玉春
|
ccf0c59981
|
Update model.php
|
2021-11-11 02:56:33 +00:00 |
|
|
leiyong
|
08d0a5f2aa
|
* Finish task#44172,task#44273.
|
2021-11-11 02:53:19 +00:00 |
|
|
zhengrunyu
|
d4e0ccdef0
|
*Finish task #44163.
|
2021-11-11 10:49:13 +08:00 |
|
|
tianshujie
|
8b9ee17312
|
* Restore code.
|
2021-11-11 10:47:28 +08:00 |
|
|
zhengrunyu
|
e2b3ba1066
|
*Finish task #44163.
|
2021-11-11 10:47:02 +08:00 |
|
|
tianshujie
|
160b1c9fca
|
* Restore code.
|
2021-11-11 10:44:07 +08:00 |
|
|
tianshujie
|
c08bd0faef
|
* Fix the problem of judging product permissions.
|
2021-11-11 10:30:29 +08:00 |
|
|
tianshujie
|
ce001d77e3
|
* Fix the problem of judging product permissions.
|
2021-11-11 10:27:24 +08:00 |
|
|
zhengrunyu
|
301d5b912e
|
*Finish task #44163.
|
2021-11-11 10:20:58 +08:00 |
|
|
李玉春
|
ef338371e1
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix the problem of storing cookies in product branches.
See merge request easycorp/zentaopms!396
|
2021-11-11 02:20:28 +00:00 |
|
|
tianshujie
|
41045ea4bc
|
* Replace session with productID.
|
2021-11-11 10:18:59 +08:00 |
|
|
tianshujie
|
2ebd3b2b50
|
* Modify the logic of the product record session.
|
2021-11-11 10:13:01 +08:00 |
|