|
...
|
...
|
@@ -25,13 +25,6 @@ |
|
|
|
"list": []
|
|
|
|
},
|
|
|
|
"plugin": {
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"current": -1,
|
|
|
|
"list": []
|
|
|
|
},
|
|
|
|
"game": {
|
|
|
|
=======
|
|
|
|
>>>>>>> 742b83ead16aac22bc6c77c7d32ecc7d190bad80
|
|
|
|
"current": -1,
|
|
|
|
"list": []
|
|
|
|
},
|
|
...
|
...
|
@@ -40,11 +33,7 @@ |
|
|
|
"list": []
|
|
|
|
},
|
|
|
|
"miniprogram": {
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"current": 3,
|
|
|
|
=======
|
|
|
|
"current": 0,
|
|
|
|
>>>>>>> 742b83ead16aac22bc6c77c7d32ecc7d190bad80
|
|
|
|
"list": [
|
|
|
|
{
|
|
|
|
"id": 0,
|
...
|
...
|
|
