Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

cehua_hzl

2018-11-21 0a2816dcee918bd7d9201d3a9edfec533c0a053a

1
2
3
4
5
6
7
8
9
countNeed    attType    attValue 
100    6|7    1000|100 
140    6|7    3000|200 
160    6|7    6000|300 
200    6|7    8000|400 
250    6|7    10000|500 
300    6|7    12000|600 
350    6|7    16000|800 
400    6|7    20000|1000