caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-07-05 09:25:10 +08:00
commit d06b5ceb89
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
View File

@ -53,8 +53,8 @@ public class ArticleManagerController {
} }
@ApiOperation(value = "添加文章") @ApiOperation(value = "添加文章")
@PostMapping @PostMapping(consumes = "application/json", produces = "application/json")
public ResultMessage<Article> save(@Valid Article article) { public ResultMessage<Article> save(@RequestBody Article article) {
article.setType(ArticleEnum.OTHER.name()); article.setType(ArticleEnum.OTHER.name());
articleService.save(article); articleService.save(article);
return ResultUtil.data(article); return ResultUtil.data(article);
@ -62,8 +62,8 @@ public class ArticleManagerController {
@ApiOperation(value = "修改文章") @ApiOperation(value = "修改文章")
@ApiImplicitParam(name = "id", value = "文章ID", required = true, paramType = "path") @ApiImplicitParam(name = "id", value = "文章ID", required = true, paramType = "path")
@PutMapping("update/{id}") @PutMapping(value = "update/{id}", consumes = "application/json", produces = "application/json")
public ResultMessage<Article> update(@Valid Article article, @PathVariable("id") String id) { public ResultMessage<Article> update(@RequestBody Article article, @PathVariable("id") String id) {
article.setId(id); article.setId(id);
return ResultUtil.data(articleService.updateArticle(article)); return ResultUtil.data(articleService.updateArticle(article));
} }

4
update-sql/version4.1to4.2.sql
View File

@ -4,4 +4,6 @@ ALTER TABLE li_distribution ADD settlement_bank_account_num varchar ( 200 );
ALTER TABLE li_distribution ADD settlement_bank_branch_name varchar ( 200 ); ALTER TABLE li_distribution ADD settlement_bank_branch_name varchar ( 200 );
/** 文章分类添加默认值**/ /** 文章分类添加默认值**/
ALTER TABLE li_article_category alter column sort set default 0; ALTER TABLE li_article_category alter column sort set default 0;
/** 添加分销提现菜单**/
INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null');