--no commit message

com.zrqx.core/.classpath

@@ -32,5 +32,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.zrqx.core/.settings/org.eclipse.core.resources.prefs

 eclipse.preferences.version=1
-encoding//src/main/java/com/zrqx/core/util/LogUtils.java=UTF-8
 encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8

com.zrqx.core/pom.xml

@@ -107,6 +107,11 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.47</version>
 		</dependency>
+		<dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-library</artifactId>
+			<version>2.11.0</version>
+		</dependency>
 	</dependencies>
 
 

com.zrqx.core/src/main/java/com/zrqx/core/model/order/OrderInfo.java

@@ -25,7 +25,7 @@ public class OrderInfo {
 	@ApiModelProperty("id")
 	@GeneratedValue(generator = "JDBC")
 	@Id
-	private BigInteger id;
+	private Integer id;
 	
 	@ApiModelProperty("订单id")
 	private Integer orderid;

com.zrqx.core/src/main/java/com/zrqx/core/vo/order/fg/FgOrderInfoPageVo.java

 package com.zrqx.core.vo.order.fg;
 
-import java.math.BigDecimal;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 import lombok.Data;
 
 /**