样品增加产地字段

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

@@ -36,9 +36,9 @@ public class WeiXinController {
         log.debug("=============================================");
         try {
             //测试服务器
-//            return weiXinService.getTestToken(code);
+            return weiXinService.getTestToken(code);
             //正式服务器
-            return weiXinService.getToken(code, "APP");
+//            return weiXinService.getToken(code, "APP");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -50,9 +50,9 @@ public class WeiXinController {
     public BaseResponse getPCToken(String code) {
         try {
             //测试服务器
-//            return weiXinService.getTestToken(code);
+            return weiXinService.getTestToken(code);
             //正式服务器
-            return weiXinService.getToken(code, "PC");
+//            return weiXinService.getToken(code, "PC");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Sample.java

@@ -113,4 +113,7 @@ public class Sample implements Serializable {
 
 	@ApiModelProperty("样品是否校核完成（0未检测完成， 1检测完成，）")
 	private Integer isCheck;
+
+	@ApiModelProperty("产地")
+	private String origin;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleTmp.java

@@ -67,4 +67,7 @@ public class SampleTmp implements Serializable {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EntrustQuery.java

@@ -59,4 +59,5 @@ public class EntrustQuery {
 	@ApiModelProperty("样品及检测项列表")
 	private List<SampleTmpQuery> sampleTmpList;
 
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleQuery.java

@@ -57,4 +57,7 @@ public class SampleQuery {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleTmpQuery.java

@@ -40,4 +40,7 @@ public class SampleTmpQuery {
 	@ApiModelProperty("(检测依据编号)  例子：01、23、15")
 	private String methodNumbers;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleTmpVo.java

@@ -48,4 +48,7 @@ public class SampleTmpVo {
 	@ApiModelProperty("收费标准")
 	private BigDecimal charge;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleVo.java

@@ -103,4 +103,7 @@ public class SampleVo {
 	@ApiModelProperty("样品是否校核完成（0未检测完成， 1检测完成，）")
 	private Integer isCheck;
 
+	@ApiModelProperty("产地")
+	private String origin;
+
 }

cement-business/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
     active: dev
   datasource:
     # 192.168.110.85   admin!@#123
-#    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver