fix confilict
This commit is contained in:
commit
51e0aa42b6
@ -1,117 +1 @@
|
||||
[
|
||||
{
|
||||
"id": 99001,
|
||||
"type_id": 1,
|
||||
"value": 6
|
||||
},
|
||||
{
|
||||
"id": 99002,
|
||||
"type_id": 1,
|
||||
"value": 2
|
||||
},
|
||||
{
|
||||
"id": 99003,
|
||||
"type_id": 2,
|
||||
"value": 20
|
||||
},
|
||||
{
|
||||
"id": 99004,
|
||||
"type_id": 1,
|
||||
"value": 2
|
||||
},
|
||||
{
|
||||
"id": 99005,
|
||||
"type_id": 1,
|
||||
"value": 3
|
||||
},
|
||||
{
|
||||
"id": 99006,
|
||||
"type_id": 1,
|
||||
"value": 4
|
||||
},
|
||||
{
|
||||
"id": 99007,
|
||||
"type_id": 1,
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"id": 99008,
|
||||
"type_id": 2,
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"id": 99009,
|
||||
"type_id": 2,
|
||||
"value": 15
|
||||
},
|
||||
{
|
||||
"id": 99010,
|
||||
"type_id": 2,
|
||||
"value": 18
|
||||
},
|
||||
{
|
||||
"id": 99011,
|
||||
"type_id": 2,
|
||||
"value": 20
|
||||
},
|
||||
{
|
||||
"id": 99012,
|
||||
"type_id": 2,
|
||||
"value": 5
|
||||
},
|
||||
{
|
||||
"id": 99013,
|
||||
"type_id": 1,
|
||||
"value": 5
|
||||
},
|
||||
{
|
||||
"id": 99014,
|
||||
"type_id": 2,
|
||||
"value": 5
|
||||
},
|
||||
{
|
||||
"id": 99015,
|
||||
"type_id": 1,
|
||||
"value": 10
|
||||
},
|
||||
{
|
||||
"id": 99016,
|
||||
"type_id": 1,
|
||||
"value": 10
|
||||
},
|
||||
{
|
||||
"id": 99017,
|
||||
"type_id": 2,
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"id": 99018,
|
||||
"type_id": 2,
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"id": 99019,
|
||||
"type_id": 2,
|
||||
"value": 3
|
||||
},
|
||||
{
|
||||
"id": 99020,
|
||||
"type_id": 2,
|
||||
"value": 20
|
||||
},
|
||||
{
|
||||
"id": 99021,
|
||||
"type_id": 3,
|
||||
"value": 30
|
||||
},
|
||||
{
|
||||
"id": 99022,
|
||||
"type_id": 3,
|
||||
"value": 70
|
||||
},
|
||||
{
|
||||
"id": 99023,
|
||||
"type_id": 1,
|
||||
"value": 2
|
||||
}
|
||||
]
|
||||
[{"id":99001,"type_id":1,"value":6},{"id":99002,"type_id":1,"value":2},{"id":99003,"type_id":2,"value":20},{"id":99004,"type_id":1,"value":2},{"id":99005,"type_id":1,"value":3},{"id":99006,"type_id":1,"value":4},{"id":99007,"type_id":1,"value":12},{"id":99008,"type_id":2,"value":12},{"id":99009,"type_id":2,"value":15},{"id":99010,"type_id":2,"value":18},{"id":99011,"type_id":2,"value":20},{"id":99012,"type_id":2,"value":5},{"id":99013,"type_id":1,"value":5},{"id":99014,"type_id":2,"value":5},{"id":99015,"type_id":1,"value":10},{"id":99016,"type_id":1,"value":10},{"id":99017,"type_id":2,"value":12},{"id":99018,"type_id":2,"value":12},{"id":99019,"type_id":2,"value":3},{"id":99020,"type_id":2,"value":20},{"id":99021,"type_id":3,"value":10},{"id":99022,"type_id":3,"value":55},{"id":99023,"type_id":1,"value":2}]
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user