合并代码

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -224,6 +224,9 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="员工登陆账号(手机号)",example="员工登陆账号(手机号)")
 	@ApiModelProperty(value="员工登陆账号(手机号)",example="员工登陆账号(手机号)")
 	private String empLoginPhone;
 	private String empLoginPhone;
 
 
+	@ApiModelProperty(value="是否已投保：0否 1是 ",example="")
+	private int isInsure;
+	
 	
 	
 	
 	
 }
 }

src/main/java/cn/timer/api/utils/HttpUtils.java

@@ -17,6 +17,8 @@ import javax.net.ssl.X509TrustManager;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import com.alibaba.fastjson.JSONObject;
+
 /**
 /**
  * 通用http发送方法
  * 通用http发送方法
  *
  *

src/main/resources/application.yml

 spring:
 spring:
   profiles:
   profiles:
-     active: pro
+     active: test
     #active: '@environment@'
     #active: '@environment@'
\ No newline at end of file