..........

@@ -79,30 +79,26 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-<<<<<<< Updated upstream
 		<dependency>
-            <groupId>com.tianbo</groupId>
-            <artifactId>util</artifactId>
-            <version>1.0-SNAPSHOT</version>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.4</version>
+			<classifier>jdk15</classifier>
 		</dependency>
-=======
-        <!--<dependency>-->
-            <!--<groupId>com.tianbo</groupId>-->
-            <!--<artifactId>util</artifactId>-->
-            <!--<version>1.0-SNAPSHOT</version>-->
-        <!--</dependency>-->
->>>>>>> Stashed changes
+
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.4</version>
+			<classifier>jdk15</classifier>
+		</dependency>
+
 		<dependency>
 			<groupId>net.sf.json-lib</groupId>
 			<artifactId>json-lib</artifactId>
 			<version>2.4</version>
 			<classifier>jdk15</classifier>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>com.fasterxml.jackson.core</groupId>-->
-			<!--<artifactId>jackson-core</artifactId>-->
-			<!--<version>2.9.5</version>-->
-		<!--</dependency>-->
 		<!--集成swagger2，下面两个spring的配置解决springboot包 与swagger2的包冲突问题，生产部署的时候记得要去掉此swagger2的配置，开发环境开启-->
 		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
 		<dependency>
@@ -205,6 +201,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
@@ -222,7 +219,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
-
 </project>

@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication()
 @EnableScheduling
 @MapperScan("com.sunyo.energy.location.dao")
-@ComponentScan("com.sunyo.energy.location")
+//@ComponentScan("com.sunyo.energy.location")
 public class BootApplication {
 
 	public static void main(String[] args) {

 package com.sunyo.energy.location.controller;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.sunyo.energy.location.controller.response.ResultJson;
-import com.sunyo.energy.location.dao.WaterMeterMapper;
-import com.sunyo.energy.location.model.Location;
-import com.sunyo.energy.location.model.WaterElectricityParameter;
 import com.sunyo.energy.location.model.WaterMeter;
 import com.sunyo.energy.location.service.WaterMeterService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -36,11 +28,4 @@ public class WaterMeterController {
     }
 
 
-//    @RequestMapping("/findRealTimes")
-//    @ResponseBody
-//    public void findRealTimes(){
-//
-//        waterMeterService.realTime();
-//    }
-
 }

 package com.sunyo.energy.location.service;
 
-import com.github.pagehelper.PageInfo;
-import com.sunyo.energy.location.model.PayRecords;
+        import com.github.pagehelper.PageInfo;
+        import com.sunyo.energy.location.model.PayRecords;
 
 /**
  * Created by XYH on 2019/12/16.

@@ -31,13 +31,6 @@ public class PayOrderImpl implements PayOrderService {
 
         Page<PayRecords> page =  PageHelper.startPage(pageNum,pageSize);
 
-        if (StringUtils.isEmpty(orderNumber)){
-
-        }else if (!orderNumber.contains("-")){
-            StringBuffer stringBuffer = new StringBuffer(orderNumber);
-            orderNumber = stringBuffer.insert(3, "-").toString();
-        }
-
         if (!StringUtils.isEmpty(payTime) && !payTime.contains("undefined")){
             String[] split = payTime.split(",");
             startTime = split[0].toString();

@@ -6,8 +6,8 @@ docker:
     ip: 192.168.1.63
 server:
   port: 10003
-  servlet:
-    context-path: ${SERVER_CONTEXTPATH:}
+#  servlet:
+#    context-path: ${SERVER_CONTEXTPATH:}
 spring:
   profiles:
     active: dev