Merge branch 'feature-airWallet' into dev

# Conflicts:
#	src/main/java/com/szwl/controller/TAdminController.java

src/main/java/com/szwl/model/query/TCoinOrderParam.java

@@ -25,9 +25,9 @@ import java.util.List;
 @Setter
 @ToString
 public class TCoinOrderParam extends TCoinOrder {
-	 @CamelCaseToUnderscore
-     @ApiModelProperty(value = "排序,如：id desc")
-     private String orderByClause;
+    @CamelCaseToUnderscore
+    @ApiModelProperty(value = "排序,如：id desc")
+    private String orderByClause;
     @ApiModelProperty(value = "是否distinct")
     private boolean distinct;
     @ApiModelProperty(value = "分页，展示多少条记录")

src/main/java/com/szwl/model/query/TOrderParam.java

@@ -25,9 +25,9 @@ import java.util.List;
 @Setter
 @ToString
 public class TOrderParam extends TOrder {
-	 @CamelCaseToUnderscore
-     @ApiModelProperty(value = "排序,如：id desc")
-     private String orderByClause;
+	@CamelCaseToUnderscore
+	@ApiModelProperty(value = "排序,如：id desc")
+	private String orderByClause;
     @ApiModelProperty(value = "是否distinct")
     private boolean distinct;
     @ApiModelProperty(value = "分页，展示多少条记录")