合并分支 'dev' 到 'master'

CHANGELOG.md

+## [1.0.2](https://git.yfzx.zjtys.com.cn/matrix/pipline-test/compare/1.0.4...1.0.2) (2021-08-17)
+
+
+### Features
+
+* **pipline:** 测试 ([fbe3c86](https://git.yfzx.zjtys.com.cn/matrix/pipline-test/commits/fbe3c8654e3f74527fd5815c1f3f8561e6b443a8))
+* **pipline:** 测试功能 ([c96e03e](https://git.yfzx.zjtys.com.cn/matrix/pipline-test/commits/c96e03e19d53953dad8d1fe6ef69384a2b53ab30))
+
+
+
 ## [1.0.4](https://git.yfzx.zjtys.com.cn/matrix/pipline-test/compare/1.0.3...1.0.4) (2021-08-16)
 
 

package.json

 {
   "devDependencies": {
     "commitizen": "^4.0.3",
-    "cz-conventional-changelog": "^3.3.0"
+    "cz-conventional-changelog": "^3.0.2"
   },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "version": "1.0.4",
+  "version": "v1.0.2",
   "scripts": {
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md"
   }
-}
+}
\ No newline at end of file

src/main/java/com/example/javapipline/JavaPiplineApplication.java

@@ -16,7 +16,7 @@ public class JavaPiplineApplication {
 
     @GetMapping("/hello")
     public ResponseEntity<String> helloWorld(){
-        return ResponseEntity.ok("Hello pipeline7!");
+        return ResponseEntity.ok("Hello pipeline8!");
     }
 
 }