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

cehua_lgq

2018-10-25 4a700bbe9efa733a7cf9f9609a409c39101ebff2

1
2
3
4
DataMapId    InspireType    InspireCount    MoneyCount 
31080    3    5    1000 
31080    5    10    5 
52010    1    10    (min(encourageLV,4)+1)*2