merge from main branch

CHANGELOG.md

@@ -93,6 +93,19 @@ All notable changes to paopao-ce are documented in this file.
 
 - remove `Deprecated:OldWeb` feature  [#256](https://github.com/rocboss/paopao-ce/pull/256)   
 
+## 0.2.5
+
+### Changed
+
+- fixed sql ddl error for contact table [#281](https://github.com/rocboss/paopao-ce/pull/281)
+
+## 0.2.4
+
+### Added
+
+-  add PWA support for web frontend [#242](https://github.com/rocboss/paopao-ce/pull/242)
+
+
 ## 0.2.3
 
 ### Added

docker-compose.yaml

@@ -111,7 +111,7 @@ services:
       - paopao-network
 
   backend:
-    image: bitbus/paopao-ce:latest
+    image: bitbus/paopao-ce:nightly
     restart: always
     depends_on:
       - db

scripts/paopao-mysql.sql

@@ -349,7 +349,7 @@ CREATE TABLE `p_contact_group` (
 	`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '联系人ID',
 	`user_id` int NOT NULL DEFAULT '0' COMMENT '用户id',
 	`name` varchar(32) NOT NULL DEFAULT '' COMMENT '分组名称',
-	`is_delete` tinyint NOT NULL DEFAULT '1' COMMENT '是否删除, 0否, 1是',
+	`is_del` tinyint NOT NULL DEFAULT '1' COMMENT '是否删除, 0否, 1是',
 	`created_on` bigint unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
 	`modified_on` bigint unsigned NOT NULL DEFAULT '0' COMMENT '修改时间',
 	`deleted_on` bigint unsigned NOT NULL DEFAULT '0' COMMENT '删除时间',