dkyChenJiang.git

			@@ -98,17 +98,15 @@
			@Excel(name = "无法定位的原因")
			private String reason;

			/** 现场拍照1 */
			@Excel(name = "现场拍照1")
			private String pic1;

			/** 现场拍照2 */
			@Excel(name = "现场拍照2")
			private String pic2;
			/** 当前进度 footageCpl/footage */
			private Double rate;

			/** 现场拍照3 */
			@Excel(name = "现场拍照3")
			private String pic3;
			/** 总进尺 */
			private Double footage;

			/** 已完成进尺 */
			private Double footageCpl;

			/** 钻孔状态 */
			@Excel(name = "钻孔状态")
			@@ -120,6 +118,31 @@

			/** 是否被异常扫描（0-未扫描，1-已扫描） */
			private String isFlag;

			public Double getRate() {
			return rate;
			}

			public void setRate(Double rate) {
			this.rate = rate;
			}

			public Double getFootage() {
			return footage;
			}

			public void setFootage(Double footage) {
			this.footage = footage;
			}

			public Double getFootageCpl() {
			return footageCpl;
			}

			public void setFootageCpl(Double footageCpl) {
			this.footageCpl = footageCpl;
			}


			public void setIds(String ids)
			{
			@@ -301,33 +324,7 @@
			{
			return reason;
			}
			public void setPic1(String pic1)
			{
			this.pic1 = pic1;
			}

			public String getPic1()
			{
			return pic1;
			}
			public void setPic2(String pic2)
			{
			this.pic2 = pic2;
			}

			public String getPic2()
			{
			return pic2;
			}
			public void setPic3(String pic3)
			{
			this.pic3 = pic3;
			}

			public String getPic3()
			{
			return pic3;
			}
			public void setStatus(String status)
			{
			this.status = status;
			@@ -380,9 +377,9 @@
			.append("position", getPosition())
			.append("locateTime", getLocateTime())
			.append("reason", getReason())
			.append("pic1", getPic1())
			.append("pic2", getPic2())
			.append("pic3", getPic3())
			.append("rate", getRate())
			.append("footage", getFootage())
			.append("footageCpl", getFootageCpl())
			.append("status", getStatus())
			.append("isDeleted", getIsDeleted())
			.append("isFlag", getIsFlag())