测试拉取提交删除

Merge remote-tracking branch '公司/master'
# Conflicts: # yudao-server/src/main/resources/testview.html
2024-07-08 20:52:44 +08:00 · 2024-07-08 20:52:03 +08:00 · 2024-07-08 20:51:40 +08:00
2 changed files with 1 additions and 11 deletions
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@ -1,4 +1,4 @@
--- #################### dev相关配置 ####################
+--- #################### 相关配置 ####################

 server:
  port: 48080
--- a/yudao-server/src/main/resources/testview.html
+++ b/yudao-server/src/main/resources/testview.html
@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
Author	SHA1	Message	Date
lxd	3a0ea58865	测试拉取提交删除 Some checks are pending Java CI with Maven / build (11) (push) Waiting to run Details Java CI with Maven / build (17) (push) Waiting to run Details Java CI with Maven / build (8) (push) Waiting to run Details yudao-ui-admin CI / build (14.x) (push) Waiting to run Details yudao-ui-admin CI / build (16.x) (push) Waiting to run Details	2024-07-08 20:52:44 +08:00
lxd	d445fcc558	Merge remote-tracking branch '公司/master' # Conflicts: # yudao-server/src/main/resources/testview.html	2024-07-08 20:52:03 +08:00
lxd	4d9bb5164e	测试拉取提交	2024-07-08 20:51:40 +08:00