From 62f9111922c5a90063e9f4a14fc20cf42d1a56be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Nov 2021 10:20:22 +0800
Subject: [PATCH] 20211125  fish

---
 src/main/resources/mapper/fish/CannonOwnRecordDao.xml                 |    2 +-
 src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java   |    5 ++++-
 src/main/java/com/xcong/excoin/modules/fish/vo/OwnCannonVo.java       |    4 ++++
 src/main/java/com/xcong/excoin/modules/fish/entity/CannonSetting.java |    4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/fish/entity/CannonSetting.java b/src/main/java/com/xcong/excoin/modules/fish/entity/CannonSetting.java
index 07461e4..b64d660 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/entity/CannonSetting.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/entity/CannonSetting.java
@@ -13,6 +13,10 @@
 public class CannonSetting {
 
     private Long id;
+    //炮台图片
+    private String cannonImg;
+    //炮弹图片
+    private String bulletImg;
     //炮台名称
     private String name;
     //炮台编码
diff --git a/src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java b/src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java
index aba8c44..89ee894 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java
@@ -11,7 +11,10 @@
 public class CannonSettingVo {
 
     private Long id;
-
+    @ApiModelProperty(value = "炮台图片")//炮台图片
+    private String cannonImg;
+    @ApiModelProperty(value = "炮弹图片")//炮弹图片
+    private String bulletImg;
     @ApiModelProperty(value = "炮台名称")//炮台名称
     private String name;
     @ApiModelProperty(value = "炮台编码")//炮台编码
diff --git a/src/main/java/com/xcong/excoin/modules/fish/vo/OwnCannonVo.java b/src/main/java/com/xcong/excoin/modules/fish/vo/OwnCannonVo.java
index 6dc2329..c4889c2 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/vo/OwnCannonVo.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/vo/OwnCannonVo.java
@@ -11,6 +11,10 @@
 
     private Long id;
     private Long memberId;
+    @ApiModelProperty(value = "炮台图片")//炮台图片
+    private String cannonImg;
+    @ApiModelProperty(value = "炮弹图片")//炮弹图片
+    private String bulletImg;
     @ApiModelProperty(value = "炮台UUID")//炮台UUID
     private String cannonUuid;
     @ApiModelProperty(value = "炮台名称")//炮台名称
diff --git a/src/main/resources/mapper/fish/CannonOwnRecordDao.xml b/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
index ba3b187..b461582 100644
--- a/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
+++ b/src/main/resources/mapper/fish/CannonOwnRecordDao.xml
@@ -7,7 +7,7 @@
     </select>
 
     <select id="selectCannonOwnRecordsByMemberId" resultType="com.xcong.excoin.modules.fish.vo.OwnCannonVo">
-        select a.*,b.gold_consume goldConsume
+        select a.*,b.gold_consume goldConsume,b.cannon_img cannonImg,b.bullet_img bulletImg
         from cannon_own_record a
         left join cannon_setting b on a.cannon_code = b.code
         where a.member_id = #{memberId}

--
Gitblit v1.9.1