 李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +08:00 |
|
|
xieqiyu
|
3755502cf5
|
* Fix bug : Unit test product drop-down error.
|
2021-12-02 09:12:50 +08:00 |
|
|
mayue
|
a2dc25af7c
|
* Code format.
|
2021-12-01 15:02:12 +08:00 |
|
|
mayue
|
fc0834cadb
|
* Modify code #44987,44988,44989.
|
2021-12-01 14:58:20 +08:00 |
|
|
mayue
|
c62d599292
|
* Finish task #44987,44988,44989.
|
2021-12-01 10:44:38 +08:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
mayue
|
f92ba845a3
|
* Fix bug #16605.
|
2021-11-25 14:35:33 +08:00 |
|
|
mayue
|
36afb288d6
|
* Fix bug #16605.
|
2021-11-25 13:31:35 +08:00 |
|
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
|
zhengrunyu
|
2d168bf7e8
|
*Finish task 16602.
|
2021-11-24 11:00:21 +08:00 |
|
|
zhujinyong
|
80010bb881
|
* Adjust batchEdit of story.
|
2021-11-23 19:46:35 +08:00 |
|
|
songchenxuan
|
9be4ee136f
|
* Fix bug #16560.
|
2021-11-23 15:35:21 +08:00 |
|
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
|
hufangzhou
|
5492d27798
|
* Fix bug #16512.
|
2021-11-22 13:46:02 +08:00 |
|
|
zhouxin
|
b8783ecd5c
|
Fix bug 16408.
|
2021-11-18 17:32:02 +08:00 |
|
|
zhouxin
|
e55bc34ee6
|
Fix bug 16408.
|
2021-11-18 16:26:29 +08:00 |
|
|
孙广明
|
66dd543027
|
Merge branch 'sprint/170_zhengrunyu_44597' into 'sprint/170'
*Finish task #44597.
See merge request easycorp/zentaopms!492
|
2021-11-18 00:58:13 +00:00 |
|
|
zhengrunyu
|
f47e855649
|
*Finish task #44597.
|
2021-11-17 17:25:37 +08:00 |
|
|
zhengrunyu
|
36d7e664e6
|
*Finish task #44597.
|
2021-11-17 16:20:54 +08:00 |
|
|
songchenxuan
|
73b5f5e057
|
* Product-Settings-Branch/platform-Language item
|
2021-11-15 13:44:26 +08:00 |
|
|
李玉春
|
878b22f8ca
|
Merge branch 'sprint/170_songchenxuan_codeforbug' into 'sprint/170'
* Product->Setting Language item modification.
See merge request easycorp/zentaopms!444
|
2021-11-15 05:32:14 +00:00 |
|
|
songchenxuan
|
de30e9216d
|
* Product->Setting Language item modification.
|
2021-11-15 11:03:54 +08:00 |
|
|
songchenxuan
|
7cebe10e8d
|
* Product->Setting Language item modification.
|
2021-11-15 10:55:24 +08:00 |
|
|
songchenxuan
|
c2d3d4a24b
|
* Product->Setting Language item modification.
|
2021-11-15 09:42:16 +08:00 |
|
|
songchenxuan
|
9ae77a2765
|
* Product->Setting Language item modification.
|
2021-11-12 15:54:10 +08:00 |
|
|
liyuchun
|
0c7bcaf928
|
* Fix error of manage product.
|
2021-11-12 15:07:42 +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 |
|
|
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 |
|
|
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 |
|
|
xieqiyu
|
50b928ac9b
|
* Fix bug#16143.
|
2021-11-10 14:48:37 +08:00 |
|
|
hufangzhou
|
98ec568b0f
|
* Fix bug #16140.
|
2021-11-10 14:48:09 +08:00 |
|
|
xieqiyu
|
8d9aebb855
|
* Fix bug#16142.
|
2021-11-10 14:29:32 +08:00 |
|
|
xieqiyu
|
36b9634059
|
* Add duplicate name judgment.
|
2021-11-10 14:21:47 +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 |
|
|
xieqiyu
|
089238bd79
|
* Modify review questions.
|
2021-11-10 12:26:55 +08:00 |
|
|
xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +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 |
|
|
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
|
35504f6745
|
* Combine the acquisition branch into a function.
|
2021-11-10 09:17:28 +08:00 |
|