Merge remote-tracking branch 'origin/master'

pom.xml

@@ -125,6 +125,12 @@
             <version>3.4.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>health-api-mybasic</artifactId>
+            <version>3.6.4</version>
+        </dependency>
+
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>health-common-security</artifactId>
@@ -136,6 +142,7 @@
             <version>2.7.13</version><!--autoconfigure-->
         </dependency>
 
+
 <!--支付宝沙箱依赖-->
 <!--        <dependency>-->
 <!--            <groupId>com.alipay.sdk</groupId>-->

src/main/java/com/ruoyi/mybasic/Text/Queue.java

@@ -7,6 +7,11 @@ import lombok.Data;
  * @Description 数据结构队列测试
  * @Author WenHao.Sao
  */
+
+/**
+ * 队列
+ * @author
+ */
 @Data
 public class Queue {
 

src/main/java/com/ruoyi/mybasic/common/domain/Archives.java

@@ -64,4 +64,6 @@ public class Archives {
      */
     private List<String> pictureList;
 
+
+
 }

src/main/java/com/ruoyi/mybasic/common/domain/UserMoneyLogs.java

@@ -1,50 +0,0 @@
-package com.ruoyi.mybasic.common.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 支出收入流水记录
- * @author Lou_Zs
- */
-@Data
-public class UserMoneyLogs {
-
-
-    /**
-     * 记录主建
-     */
-    private Integer id;
-    /**
-     * 状态
-     * 1:支出
-     * 2:收入
-     */
-    private Integer status;
-    /**
-     * 详情
-     */
-    private String moneyTypeName;
-    /**
-     * 钱包主建
-     */
-    private Integer userId;
-    /**
-     * 具体金额
-     */
-    private Integer amountIncome;
-
-    //审计字段
-
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createTime;
-
-
-}

src/main/java/com/ruoyi/mybasic/common/domain/response/BankResponse.java

@@ -12,6 +12,7 @@ import java.util.Date;
 @Data
 public class BankResponse {
 
+
     private String bankName;//银行名称
 
     private String bankNumber;//银行卡账号

src/main/java/com/ruoyi/mybasic/controller/InvitationController.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 
 /**
- * 邀请获利控制层
+ * 交易控制层
  * @author Lou_Zs
  */
 @RestController

src/main/java/com/ruoyi/mybasic/mapper/InvitationMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.mybasic.mapper;
 
 
-import com.ruoyi.mybasic.common.domain.UserMoneyLogs;
+import com.ruoyi.mybasic.api.domain.UserMoneyLogs;
 import com.ruoyi.mybasic.common.domain.request.InvitationRecordRequest;
 import com.ruoyi.mybasic.common.domain.request.PurseRequest;
 import com.ruoyi.mybasic.common.domain.request.RequestInvitationRecord;

src/main/java/com/ruoyi/mybasic/service/Impl/ArchivesServiceImpl.java

@@ -77,7 +77,6 @@ public class ArchivesServiceImpl implements ArchivesService {
 
     /**
      * 编辑我的档案
-     *
      * @param archives
      */
     @Override
@@ -102,7 +101,6 @@ public class ArchivesServiceImpl implements ArchivesService {
 
     /**
      * 根据档案编号删除档案
-     *
      * @param id
      */
     @Override

src/main/java/com/ruoyi/mybasic/service/Impl/InvitationServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ruoyi.mybasic.service.Impl;
 
-import com.ruoyi.mybasic.common.domain.UserMoneyLogs;
+import com.ruoyi.mybasic.api.domain.UserMoneyLogs;
 import com.ruoyi.mybasic.common.domain.request.RequestInvitationRecord;
 import com.ruoyi.mybasic.mapper.InvitationMapper;
 import com.ruoyi.mybasic.service.InvitationService;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @Author WenHao.Sao
  */
 /**
- * 邀请获利实现层
+ * 交易实现层
  * @author Lou_Zs
  */
 @Service
@@ -28,6 +28,7 @@ public class InvitationServiceImpl implements InvitationService {
 
 
 
+
     /**
      * 新用户注册邀请获利
      * @param requestInvitationRecord

src/main/java/com/ruoyi/mybasic/service/InvitationService.java

@@ -9,7 +9,7 @@ import com.ruoyi.mybasic.common.domain.request.RequestInvitationRecord;
  */
 
 /**
- * 邀请获利持久层
+ * 交易持久层
  * @author Lou_Zs
  */
 public interface InvitationService {