mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-11-04 10:57:10 +08:00 
			
		
		
		
	Merge branch '1.0.x' into dev
# Conflicts: # README.md
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "continew-admin-ui",
 | 
					  "name": "continew-admin-ui",
 | 
				
			||||||
  "description": "ContiNew Admin 中后台管理框架,Continue New Admin,持续以最新流行技术栈构建,拥抱变化,迭代优化。",
 | 
					  "description": "ContiNew Admin 中后台管理框架,Continue New Admin,持续以最新流行技术栈构建,拥抱变化,迭代优化。",
 | 
				
			||||||
  "version": "1.0.0",
 | 
					  "version": "1.0.1-SNAPSHOT",
 | 
				
			||||||
  "private": true,
 | 
					  "private": true,
 | 
				
			||||||
  "author": "Charles7c",
 | 
					  "author": "Charles7c",
 | 
				
			||||||
  "license": "Apache-2.0",
 | 
					  "license": "Apache-2.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@ continew-admin:
 | 
				
			|||||||
  # 应用名称
 | 
					  # 应用名称
 | 
				
			||||||
  appName: continew-admin
 | 
					  appName: continew-admin
 | 
				
			||||||
  # 版本
 | 
					  # 版本
 | 
				
			||||||
  version: 1.0.0
 | 
					  version: 1.0.1-SNAPSHOT
 | 
				
			||||||
  # 描述
 | 
					  # 描述
 | 
				
			||||||
  description: ContiNew Admin 中后台管理框架/脚手架,Continue New Admin,持续以最新流行技术栈构建,拥抱变化,迭代优化。
 | 
					  description: ContiNew Admin 中后台管理框架/脚手架,Continue New Admin,持续以最新流行技术栈构建,拥抱变化,迭代优化。
 | 
				
			||||||
  # URL
 | 
					  # URL
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							@@ -59,7 +59,7 @@ limitations under the License.
 | 
				
			|||||||
        <hutool.version>5.8.16</hutool.version>
 | 
					        <hutool.version>5.8.16</hutool.version>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- ### 基础环境相关 ### -->
 | 
					        <!-- ### 基础环境相关 ### -->
 | 
				
			||||||
        <revision>1.0.0</revision>
 | 
					        <revision>1.0.1-SNAPSHOT</revision>
 | 
				
			||||||
        <java.version>1.8</java.version>
 | 
					        <java.version>1.8</java.version>
 | 
				
			||||||
        <spotless.version>2.28.0</spotless.version>
 | 
					        <spotless.version>2.28.0</spotless.version>
 | 
				
			||||||
        <maven.compiler.source>8</maven.compiler.source>
 | 
					        <maven.compiler.source>8</maven.compiler.source>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user