Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
| | |
|---|
| | | 60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,50,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
|
|---|
| | | 60010 1 60010 150 500 0 0 0 0 0 0 0 [208,24] [10,1800,50,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
|
|---|
| | | 60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,50,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
|
|---|
| | | 31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
|
|---|
| | | 31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
|
|---|
| | | 31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
|
|---|
| | | 31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
|
|---|
| | | 31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
|
|---|
| | | 31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
|
|---|
| | | 31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
|
|---|
| | | 52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
|
|---|
| | | 52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
|
|---|
