Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckResultController.java

+package com.yeejoin.amos.boot.module.tdc.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+
+/**
+ * 校验结果
+ * @author xxz
+ */
+@RestController
+@Api(tags = "校验结果Api")
+@RequestMapping(value = "/check-result")
+public class CheckResultController extends BaseController {
+
+
+
+    /**
+     * cs
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/test")
+    @ApiOperation(httpMethod = "GET", value = "测试", notes = "测试")
+    public String test() {
+        return "aaaaa";
+    }
+}

amos-boot-system-tzs/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-privilege</artifactId>
-            <version>1.7.12-SNAPSHOT</version>
+            <version>1.7.13-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -214,7 +214,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-privilege</artifactId>
-			<version>1.7.13-SNAPSHOT</version>
+			<version>${amos.version}</version>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>