 tianshujie
|
edd64950ab
|
* Fix the problem of reporting errors on the batch editing story page.
|
2021-11-11 13:44:27 +08: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 |
|
|
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 |
|
|
tianshujie
|
603f57a826
|
* Fix the problem of storing cookies in product branches.
|
2021-11-11 09:59:16 +08:00 |
|
|
zhengrunyu
|
db4ee8bbf8
|
*Finish task #44163.
|
2021-11-11 09:54:10 +08:00 |
|
|
李玉春
|
b5ce9fa76b
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Modify the SQL statement linked to the query story plan.
See merge request easycorp/zentaopms!395
|
2021-11-11 01:48:45 +00:00 |
|
|
tianshujie
|
5582354037
|
* When repairing the project and execution linked products, the branch judgment problem.
|
2021-11-11 09:42:37 +08:00 |
|
|
李玉春
|
62e5231ec2
|
Merge branch 'sprint/170_xieqiyu' into 'sprint/170'
Sprint/170 xieqiyu
See merge request easycorp/zentaopms!385
|
2021-11-11 01:38:37 +00:00 |
|
|
xieqiyu
|
877ebd38ad
|
* Delete unused code.
|
2021-11-11 09:37:40 +08:00 |
|
|
xieqiyu
|
00ced21b19
|
* Optimize the code.
|
2021-11-11 09:34:30 +08:00 |
|
|
李玉春
|
595f911b82
|
Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170'
* Finish task #43909.
See merge request easycorp/zentaopms!390
|
2021-11-11 01:32:54 +00:00 |
|
|
李玉春
|
9b1d2c6748
|
Update workload.html.php
|
2021-11-11 01:32:46 +00:00 |
|
|
liumengyi
|
869d0cc97e
|
* Finish task #43909.
|
2021-11-11 09:20:48 +08:00 |
|
|
李玉春
|
6c98cdac94
|
Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* The product is selected by default when modifying the branch.
See merge request easycorp/zentaopms!391
|
2021-11-11 01:17:30 +00:00 |
|
|
liumengyi
|
3a53874c1c
|
* Finish task #43909.
|
2021-11-11 09:13:50 +08:00 |
|
|
tianshujie
|
16251869b4
|
* Modify the SQL statement linked to the query story plan.
|
2021-11-11 09:10:38 +08:00 |
|
|
liumengyi
|
85f2a10cbd
|
* Finish task #43909.
|
2021-11-11 09:07:49 +08:00 |
|
|
tianshujie
|
11887cffe9
|
* The product is selected by default when modifying the branch.
|
2021-11-11 09:00:05 +08:00 |
|
|
liumengyi
|
2182c4dee5
|
* Finish task #43909.
|
2021-11-11 08:55:29 +08:00 |
|
|
xieqiyu
|
2850e195ae
|
* Modify lang item.
|
2021-11-11 08:54:26 +08:00 |
|
|
xieqiyu
|
48a32457d8
|
* Add space.
|
2021-11-11 08:41:00 +08:00 |
|
|
李玉春
|
0c72b041b4
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!389
|
2021-11-11 00:30:32 +00:00 |
|
|
mayue
|
dbfabc47c2
|
* Finish task #43892.
|
2021-11-11 08:18:08 +08:00 |
|
|
zhujinyong
|
f77b0e6d2d
|
* Check compatibility.
|
2021-11-11 05:10:38 +08:00 |
|
|
zhujinyong
|
326a9f4ce1
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-10 16:02:17 +08:00 |
|
|
zhujinyong
|
9e996b6deb
|
* Fix code error of compatibility.
|
2021-11-10 16:01:47 +08:00 |
|
|
xieqiyu
|
d2685055cb
|
* Fix a bug.
|
2021-11-10 15:44:17 +08:00 |
|
|
xieqiyu
|
880f91a3d2
|
* Add duplicate name judgment.
|
2021-11-10 15:32:05 +08:00 |
|
|
李玉春
|
09355e3de0
|
Merge branch 'sprint/170_hufangzhou_16140' into 'sprint/170'
* Fix bug #16140.
See merge request easycorp/zentaopms!386
|
2021-11-10 07:03:46 +00:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|