zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-05-29 13:23:16 +08:00
parent bffc62cbdd 7b8a273bc9
commit 9e674cffce
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/peanut/modules/common/entity/TaihuWelfareEntity.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
@TableName("taihu_welfare") @TableName("taihu_welfare")
public class TaihuWelfareEntity { public class TaihuWelfareEntity {
@@ -22,6 +24,8 @@ public class TaihuWelfareEntity {
private Integer sort; private Integer sort;
private Date createTime;
@TableLogic @TableLogic
private Integer delFlag; private Integer delFlag;
} }

2
src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class CourseMedicineServiceImpl extends ServiceImpl<CourseMedicineDao, Co
} }
} }
this.updateById(courseMedicine); this.updateById(courseMedicine);
return R.ok().put("medicine", courseMedicine); return R.ok().put("Medical", courseMedicine);
} }
private List<CourseMedicine> medicals(int id){ private List<CourseMedicine> medicals(int id){