Merge branch 'test' of http://112.74.196.215:3000/Tech2/data-daq into test

service-base/src/main/java/com/simuwang/base/common/enums/EmailCron.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
  * Description: ${DESCRIPTION}
  */
 public enum EmailCron {
-    EVERY_HOUR(1, "0 0 0/1 * * ?"), ONE_AM(2, "0 0 1 * * ?");
+    EVERY_HOUR(2, "0 0 0/1 * * ?"), ONE_AM(1, "0 0 1 * * ?");
 
     private final Integer text;
     private final String cron;

service-base/src/main/java/com/simuwang/base/mapper/DeletionInfoMapper.java

@@ -33,7 +33,7 @@ public interface DeletionInfoMapper {
 
     void batchUpdate(@Param("itemDoList") List<FundDeletionInfoDO> fundDeletionInfoDOList);
 
-    void updateRemark(@Param("fundId") String fundId, @Param("deletionType") Integer deletionType,@Param("deletionDate") String deletionDate, @Param("remark")String remark,@Param("userId")Integer userId);
+    void updateRemark(@Param("fundId") String fundId, @Param("deletionType") Integer deletionType,@Param("deletionDate") String deletionDate, @Param("remark")String remark,@Param("updaterId")Integer userId);
 
     List<FundDeletionInfoDO> selectFundDeletionInfoVOList(@Param("fundId") String fundId,@Param("deletionType") Integer deletionType);