Authored by 马力

Merge branch 'dev_compatible' into test

@@ -16,7 +16,8 @@ module.exports={ @@ -16,7 +16,8 @@ module.exports={
16 {name:'threeSortId', type:'Number'}, 16 {name:'threeSortId', type:'Number'},
17 {name: 'orderBy', type: 'Number'}, 17 {name: 'orderBy', type: 'Number'},
18 {name: 'status', type: 'Number'}, 18 {name: 'status', type: 'Number'},
19 - {name: 'gender', type: 'Number'} 19 + {name: 'gender', type: 'Number'},
  20 + {name: 'sortIco', type: 'String'}
20 ] 21 ]
21 }, 22 },
22 getProductSort:{ 23 getProductSort:{
@@ -38,7 +39,8 @@ module.exports={ @@ -38,7 +39,8 @@ module.exports={
38 {name:'threeSortId', type:'Number'}, 39 {name:'threeSortId', type:'Number'},
39 {name: 'orderBy', type: 'Number'}, 40 {name: 'orderBy', type: 'Number'},
40 {name: 'status', type: 'Number'}, 41 {name: 'status', type: 'Number'},
41 - {name: 'gender', type: 'Number'} 42 + {name: 'gender', type: 'Number'},
  43 + {name: 'sortIco', type: 'String'}
42 ] 44 ]
43 }, 45 },
44 publishProductSort:{ 46 publishProductSort:{