Merge branch 'feature/article' into develop

This commit is contained in:
2025-07-09 16:11:29 +08:00
8 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ class AdModel extends Model
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'image', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
protected $fillable = ['id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
+1 -1
View File
@@ -47,7 +47,7 @@ class AdpModel extends Model
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
protected $fillable = ['id', 'status', 'new_url', 'used_url', 'sort', 'creater', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
+1 -1
View File
@@ -28,7 +28,7 @@ class AdService extends BaseService
'default' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'img', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['ad_id', 'alt', 'title'],
],
+2 -2
View File
@@ -28,10 +28,10 @@ class AdpService extends BaseService
'default' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'new_url', 'used_url', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['adp_id', 'title'],
'ad' => ['id', 'img', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'ad' => ['id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'ad.translation' => ['ad_id', 'alt', 'title'],
],
'sorts' => [
+1 -1
View File
@@ -47,7 +47,7 @@ class AdModel extends Model
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'adp_id', 'img', 'href', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
protected $fillable = ['id', 'adp_id', 'img', 'price', 'href', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
+1 -1
View File
@@ -47,7 +47,7 @@ class AdpModel extends Model
/**
* 允许自动填充模型字段
*/
protected $fillable = ['id', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
protected $fillable = ['id', 'new_url', 'used_url', 'status', 'sort', 'creater', 'created_at', 'updated_at'];
/**
* 不允许自动填充模型字段
+2 -2
View File
@@ -33,7 +33,7 @@ class AdService extends BaseService
'default' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'adp_id', 'img', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'adp_id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['ad_id', 'alt', 'title'],
],
@@ -50,7 +50,7 @@ class AdService extends BaseService
'show' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'adp_id', 'img', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'adp_id', 'img', 'price', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['ad_id', 'alt', 'title'],
],
+2 -2
View File
@@ -33,7 +33,7 @@ class AdpService extends BaseService
'default' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'new_url', 'used_url', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['adp_id', 'title'],
],
@@ -50,7 +50,7 @@ class AdpService extends BaseService
'show' => function ($params) {
return [
'filters' => $params['filters'],
'fields' => ['id', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'fields' => ['id', 'new_url', 'used_url', 'status', 'sort', 'creater', 'created_at', 'updated_at'],
'relations' => [
'translation' => ['adp_id', 'title'],
],