 zhujinyong
|
c2feb4164f
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-10 13:50:45 +08:00 |
|
|
zhujinyong
|
40e2faf15e
|
* Fix sql error.
|
2021-11-10 13:50:29 +08:00 |
|
|
李玉春
|
8165200c74
|
Merge branch 'sprint/170_xieqiyu_43920' into 'sprint/170'
Sprint/170 xieqiyu 43920
See merge request easycorp/zentaopms!378
|
2021-11-10 05:20:01 +00:00 |
|
|
xieqiyu
|
d9564d624f
|
* Add comments.
|
2021-11-10 13:16:32 +08:00 |
|
|
李玉春
|
53d3014c45
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Finish task #43901.
See merge request easycorp/zentaopms!381
|
2021-11-10 05:16:26 +00:00 |
|
|
李玉春
|
562af98e17
|
Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170'
Finish task #43909
See merge request easycorp/zentaopms!382
|
2021-11-10 05:14:37 +00:00 |
|
|
tianshujie
|
c29ea5077a
|
* Finish task #43901.
|
2021-11-10 13:10:11 +08:00 |
|
|
liumengyi
|
651af21958
|
* Finish task #43909.
|
2021-11-10 13:09:09 +08:00 |
|
|
李玉春
|
421b19928f
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!379
|
2021-11-10 05:03:53 +00:00 |
|
|
xieqiyu
|
089238bd79
|
* Modify review questions.
|
2021-11-10 12:26:55 +08:00 |
|
|
liumengyi
|
a76e32591e
|
* Finish task #43909.
|
2021-11-10 11:30:04 +08:00 |
|
|
mayue
|
7247a7d4b5
|
* Finish task #43892.
|
2021-11-10 11:13:37 +08:00 |
|
|
李玉春
|
9b10cf663e
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Finish task #43901.
See merge request easycorp/zentaopms!372
|
2021-11-10 02:54:11 +00:00 |
|
|
李玉春
|
fe315477ea
|
Update manageproducts.html.php
|
2021-11-10 02:53:53 +00:00 |
|
|
xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +08:00 |
|
|
tianshujie
|
0ac42fe56b
|
* Modify variable value.
|
2021-11-10 10:49:53 +08:00 |
|
|
xieqiyu
|
820fbef7b4
|
* Hidden merge button.
|
2021-11-10 10:09:46 +08:00 |
|
|
xieqiyu
|
36b8752cdd
|
* Fix a bug.
|
2021-11-10 10:03:10 +08:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
xieqiyu
|
adaa7cd1d2
|
* Add dynamic when batch edit main branch.
|
2021-11-10 09:50:43 +08:00 |
|
|
hufangzhou
|
a80cdfd6ec
|
Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920
|
2021-11-10 09:49:31 +08:00 |
|
|
hufangzhou
|
9fa76f6912
|
* Modify the action of main branch.
|
2021-11-10 09:49:29 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
tianshujie
|
8174540183
|
* Remove useless code.
|
2021-11-10 09:22:08 +08:00 |
|
|
tianshujie
|
35504f6745
|
* Combine the acquisition branch into a function.
|
2021-11-10 09:17:28 +08:00 |
|
|
liumengyi
|
6bdf3553d1
|
* Finish task#43909.
|
2021-11-10 09:05:58 +08:00 |
|
|
liumengyi
|
8d79bbfd34
|
Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909
|
2021-11-10 08:44:49 +08:00 |
|
|
zhujinyong
|
ea45b8f9ea
|
* Fix compatibility.
|
2021-11-09 20:43:53 +08:00 |
|
|
xieqiyu
|
76651524d9
|
* Add order.
|
2021-11-09 20:10:07 +08:00 |
|
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +08:00 |
|
|
xieqiyu
|
0a3dc10f4a
|
* Finish task#43905.
|
2021-11-09 19:46:08 +08:00 |
|
|
hufangzhou
|
c14d00e710
|
* Code for task #43898.
|
2021-11-09 19:23:51 +08:00 |
|
|
hufangzhou
|
e3ae68fc04
|
* Add the priviledge.
|
2021-11-09 17:26:32 +08:00 |
|
|
liumengyi
|
7203acb7af
|
* Finish task#43909.
|
2021-11-09 17:25:14 +08:00 |
|
|
liumengyi
|
ed537c1415
|
* Finish task#43909.
|
2021-11-09 17:22:09 +08:00 |
|
|
hufangzhou
|
9f77cc6fb6
|
* Finish task #43898.
|
2021-11-09 17:16:30 +08:00 |
|
|
liumengyi
|
91e67125f4
|
* Finish task#43909.
|
2021-11-09 17:16:10 +08:00 |
|
|
liumengyi
|
323b167922
|
Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909
|
2021-11-09 17:09:54 +08:00 |
|
|
李玉春
|
11af94db7f
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Merge conflicts.
See merge request easycorp/zentaopms!368
|
2021-11-09 17:05:54 +08:00 |
|
|
李玉春
|
9705edb48e
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Merge conflicts.
See merge request easycorp/zentaopms!368
|
2021-11-09 08:28:32 +00:00 |
|
|
tianshujie
|
9e622a2995
|
* Merge conflicts.
|
2021-11-09 16:27:06 +08:00 |
|
|
xieqiyu
|
d889184204
|
* Finish task#43920.
|
2021-11-09 16:17:15 +08:00 |
|
|
liyuchun
|
8ee4448e4d
|
Merge branch 'sprint/170_tianshujie_43901' into sprint/170
|
2021-11-09 15:53:54 +08:00 |
|
|
zhujinyong
|
489eac1696
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-09 15:53:36 +08:00 |
|
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
|
zhujinyong
|
d99765633e
|
+ Add compatibility check.
|
2021-11-09 15:52:28 +08:00 |
|
|
tianshujie
|
8e9dd74c0d
|
* Modify code logic.
|
2021-11-09 15:47:31 +08:00 |
|
|
李玉春
|
0d9fa0869a
|
Merge branch 'sprint/170_songchenxuan_15665' into 'sprint/170'
* Fix bug #15665
See merge request easycorp/zentaopms!364
|
2021-11-09 07:09:57 +00:00 |
|
|
root
|
f49cbba01d
|
* Fix bug #15665
|
2021-11-09 14:38:14 +08:00 |
|
|
tianshujie
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|