Przeglądaj źródła

second可以本地访问8080

“xubinhui 2 lat temu
rodzic
commit
b13c0c5ce4
100 zmienionych plików z 274 dodań i 332 usunięć
  1. 4 0
      .idea/compiler.xml
  2. 0 0
      src/main/java/com/izouma/zhirongip/Application.java
  3. 1 1
      src/main/java/com/izouma/zhirongip/annotations/EnumFormat.java
  4. 1 1
      src/main/java/com/izouma/zhirongip/annotations/OperLog.java
  5. 1 1
      src/main/java/com/izouma/zhirongip/annotations/Searchable.java
  6. 1 1
      src/main/java/com/izouma/zhirongip/annotations/SearchableOne.java
  7. 11 14
      src/main/java/com/izouma/zhirongip/aspect/OperLogAspect.java
  8. 1 1
      src/main/java/com/izouma/zhirongip/config/CacheConfig.java
  9. 1 1
      src/main/java/com/izouma/zhirongip/config/Constants.java
  10. 1 1
      src/main/java/com/izouma/zhirongip/config/DateConfig.java
  11. 1 1
      src/main/java/com/izouma/zhirongip/config/LocalDateTimeSerializerConfig.java
  12. 3 4
      src/main/java/com/izouma/zhirongip/config/SpringSecurityAuditorAware.java
  13. 1 1
      src/main/java/com/izouma/zhirongip/config/WebMvcConfig.java
  14. 1 1
      src/main/java/com/izouma/zhirongip/config/WxMaConfiguration.java
  15. 1 1
      src/main/java/com/izouma/zhirongip/config/WxMaProperties.java
  16. 2 3
      src/main/java/com/izouma/zhirongip/config/WxMpConfiguration.java
  17. 1 1
      src/main/java/com/izouma/zhirongip/config/WxMpProperties.java
  18. 1 1
      src/main/java/com/izouma/zhirongip/config/WxPayConfiguration.java
  19. 1 1
      src/main/java/com/izouma/zhirongip/config/WxPayProperties.java
  20. 2 3
      src/main/java/com/izouma/zhirongip/converter/FileObjectConverter.java
  21. 2 3
      src/main/java/com/izouma/zhirongip/converter/FileObjectListConverter.java
  22. 1 2
      src/main/java/com/izouma/zhirongip/converter/JSONObjectConverter.java
  23. 2 5
      src/main/java/com/izouma/zhirongip/converter/LongArrayConverter.java
  24. 2 3
      src/main/java/com/izouma/zhirongip/converter/NumOfIpListConverter.java
  25. 1 3
      src/main/java/com/izouma/zhirongip/converter/StringArrayConverter.java
  26. 1 1
      src/main/java/com/izouma/zhirongip/converter/StringToMapConverter.java
  27. 1 1
      src/main/java/com/izouma/zhirongip/domain/AuditedEntity.java
  28. 4 1
      src/main/java/com/izouma/zhirongip/domain/Banner.java
  29. 1 1
      src/main/java/com/izouma/zhirongip/domain/BaseEntity.java
  30. 3 4
      src/main/java/com/izouma/zhirongip/domain/District.java
  31. 1 1
      src/main/java/com/izouma/zhirongip/domain/ExceptionLog.java
  32. 1 1
      src/main/java/com/izouma/zhirongip/domain/FileObject.java
  33. 1 1
      src/main/java/com/izouma/zhirongip/domain/Information.java
  34. 4 5
      src/main/java/com/izouma/zhirongip/domain/Institution.java
  35. 3 4
      src/main/java/com/izouma/zhirongip/domain/Menu.java
  36. 5 6
      src/main/java/com/izouma/zhirongip/domain/Message.java
  37. 3 4
      src/main/java/com/izouma/zhirongip/domain/Navigation.java
  38. 1 1
      src/main/java/com/izouma/zhirongip/domain/OperationLog.java
  39. 2 3
      src/main/java/com/izouma/zhirongip/domain/Partner.java
  40. 3 3
      src/main/java/com/izouma/zhirongip/domain/Personal.java
  41. 1 1
      src/main/java/com/izouma/zhirongip/domain/ServiceDetail.java
  42. 1 1
      src/main/java/com/izouma/zhirongip/domain/Setting.java
  43. 1 1
      src/main/java/com/izouma/zhirongip/domain/SmsRecord.java
  44. 1 1
      src/main/java/com/izouma/zhirongip/domain/Statistic.java
  45. 4 5
      src/main/java/com/izouma/zhirongip/domain/SuperUser.java
  46. 1 1
      src/main/java/com/izouma/zhirongip/domain/SysConfig.java
  47. 1 1
      src/main/java/com/izouma/zhirongip/domain/TestClass.java
  48. 4 5
      src/main/java/com/izouma/zhirongip/domain/User.java
  49. 7 8
      src/main/java/com/izouma/zhirongip/domain/demand/CopyrightDemand.java
  50. 6 8
      src/main/java/com/izouma/zhirongip/domain/demand/Funding.java
  51. 7 6
      src/main/java/com/izouma/zhirongip/domain/demand/LogoDemand.java
  52. 7 8
      src/main/java/com/izouma/zhirongip/domain/demand/PatentDemand.java
  53. 4 9
      src/main/java/com/izouma/zhirongip/domain/demand/TechProductDemand.java
  54. 8 13
      src/main/java/com/izouma/zhirongip/domain/resource/Company.java
  55. 7 10
      src/main/java/com/izouma/zhirongip/domain/resource/Digital.java
  56. 6 7
      src/main/java/com/izouma/zhirongip/domain/resource/Expert.java
  57. 7 9
      src/main/java/com/izouma/zhirongip/domain/resource/IntellectualProperty.java
  58. 1 1
      src/main/java/com/izouma/zhirongip/domain/resource/NumOfIp.java
  59. 8 12
      src/main/java/com/izouma/zhirongip/domain/resource/PolicyLaw.java
  60. 9 12
      src/main/java/com/izouma/zhirongip/domain/resource/Purchase.java
  61. 10 12
      src/main/java/com/izouma/zhirongip/domain/resource/SuccessCase.java
  62. 10 11
      src/main/java/com/izouma/zhirongip/domain/supply/Copyright.java
  63. 7 10
      src/main/java/com/izouma/zhirongip/domain/supply/Logo.java
  64. 7 11
      src/main/java/com/izouma/zhirongip/domain/supply/Patent.java
  65. 4 5
      src/main/java/com/izouma/zhirongip/domain/supply/ServiceProvider.java
  66. 9 7
      src/main/java/com/izouma/zhirongip/domain/supply/TechnicalManager.java
  67. 7 10
      src/main/java/com/izouma/zhirongip/domain/supply/TechnologyProduct.java
  68. 1 1
      src/main/java/com/izouma/zhirongip/dto/Captcha.java
  69. 4 5
      src/main/java/com/izouma/zhirongip/dto/CompanyDTO.java
  70. 1 1
      src/main/java/com/izouma/zhirongip/dto/DemandDTO.java
  71. 2 2
      src/main/java/com/izouma/zhirongip/dto/ExpertDTO.java
  72. 7 6
      src/main/java/com/izouma/zhirongip/dto/InstitutionDTO.java
  73. 3 5
      src/main/java/com/izouma/zhirongip/dto/IntellectualPropertyDTO.java
  74. 1 1
      src/main/java/com/izouma/zhirongip/dto/MenuDTO.java
  75. 1 1
      src/main/java/com/izouma/zhirongip/dto/PageQuery.java
  76. 5 6
      src/main/java/com/izouma/zhirongip/dto/PersonalDTO.java
  77. 2 3
      src/main/java/com/izouma/zhirongip/dto/ProductDTO.java
  78. 1 1
      src/main/java/com/izouma/zhirongip/dto/SearchDTO.java
  79. 1 1
      src/main/java/com/izouma/zhirongip/dto/TechnologyDTO.java
  80. 2 3
      src/main/java/com/izouma/zhirongip/dto/UserRegister.java
  81. 1 1
      src/main/java/com/izouma/zhirongip/dto/excel/PatentExcel.java
  82. 1 1
      src/main/java/com/izouma/zhirongip/dto/gen/GenCode.java
  83. 1 1
      src/main/java/com/izouma/zhirongip/dto/gen/Subtable.java
  84. 1 1
      src/main/java/com/izouma/zhirongip/dto/gen/TableField.java
  85. 1 1
      src/main/java/com/izouma/zhirongip/enums/ApplyStatus.java
  86. 1 1
      src/main/java/com/izouma/zhirongip/enums/AreaOfAffiliation.java
  87. 1 1
      src/main/java/com/izouma/zhirongip/enums/AuthorityName.java
  88. 1 1
      src/main/java/com/izouma/zhirongip/enums/CaseCategory.java
  89. 1 1
      src/main/java/com/izouma/zhirongip/enums/CaseType.java
  90. 1 1
      src/main/java/com/izouma/zhirongip/enums/CommissionType.java
  91. 1 1
      src/main/java/com/izouma/zhirongip/enums/CopyrightType.java
  92. 1 1
      src/main/java/com/izouma/zhirongip/enums/DigitalType.java
  93. 1 1
      src/main/java/com/izouma/zhirongip/enums/DistrictLevel.java
  94. 1 1
      src/main/java/com/izouma/zhirongip/enums/DocumentType.java
  95. 1 1
      src/main/java/com/izouma/zhirongip/enums/InstitutionalNature.java
  96. 1 1
      src/main/java/com/izouma/zhirongip/enums/IntePropLawStatus.java
  97. 1 1
      src/main/java/com/izouma/zhirongip/enums/IntePropertyType.java
  98. 1 1
      src/main/java/com/izouma/zhirongip/enums/LawStatus.java
  99. 1 1
      src/main/java/com/izouma/zhirongip/enums/LoanTerm.java
  100. 1 1
      src/main/java/com/izouma/zhirongip/enums/LogoType.java

+ 4 - 0
.idea/compiler.xml

@@ -2,20 +2,24 @@
 <project version="4">
 <project version="4">
   <component name="CompilerConfiguration">
   <component name="CompilerConfiguration">
     <annotationProcessing>
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <outputRelativeToContentRoot value="true" />
+        <module name="baixiaip" />
         <module name="yzzscq" />
         <module name="yzzscq" />
       </profile>
       </profile>
     </annotationProcessing>
     </annotationProcessing>
     <bytecodeTargetLevel>
     <bytecodeTargetLevel>
+      <module name="baixiaip" target="11" />
       <module name="yzzscq" target="11" />
       <module name="yzzscq" target="11" />
       <module name="yzzscy" target="17" />
       <module name="yzzscy" target="17" />
     </bytecodeTargetLevel>
     </bytecodeTargetLevel>
   </component>
   </component>
   <component name="JavacSettings">
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="baixiaip" options="-parameters" />
       <module name="yzzscq" options="-parameters" />
       <module name="yzzscq" options="-parameters" />
       <module name="yzzscy" options="-parameters" />
       <module name="yzzscy" options="-parameters" />
     </option>
     </option>

+ 0 - 0
src/main/java/com/izouma/yzzscq/Application.java → src/main/java/com/izouma/zhirongip/Application.java


+ 1 - 1
src/main/java/com/izouma/yzzscq/annotations/EnumFormat.java → src/main/java/com/izouma/zhirongip/annotations/EnumFormat.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.annotations;
+package com.izouma.zhirongip.annotations;
 
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;

+ 1 - 1
src/main/java/com/izouma/yzzscq/annotations/OperLog.java → src/main/java/com/izouma/zhirongip/annotations/OperLog.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.annotations;
+package com.izouma.zhirongip.annotations;
 
 
 import java.lang.annotation.*;
 import java.lang.annotation.*;
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/annotations/Searchable.java → src/main/java/com/izouma/zhirongip/annotations/Searchable.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.annotations;
+package com.izouma.zhirongip.annotations;
 
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;

+ 1 - 1
src/main/java/com/izouma/yzzscq/annotations/SearchableOne.java → src/main/java/com/izouma/zhirongip/annotations/SearchableOne.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.annotations;
+package com.izouma.zhirongip.annotations;
 
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;

+ 11 - 14
src/main/java/com/izouma/yzzscq/aspect/OperLogAspect.java → src/main/java/com/izouma/zhirongip/aspect/OperLogAspect.java

@@ -1,16 +1,14 @@
-package com.izouma.yzzscq.aspect;
-
+package com.izouma.zhirongip.aspect;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.izouma.yzzscq.annotations.OperLog;
-import com.izouma.yzzscq.domain.ExceptionLog;
-import com.izouma.yzzscq.domain.OperationLog;
-import com.izouma.yzzscq.domain.User;
-import com.izouma.yzzscq.repo.ExceptionLogRepo;
-import com.izouma.yzzscq.repo.OperationLogRepo;
-
-import com.izouma.yzzscq.utils.IPUtils;
-import com.izouma.yzzscq.utils.SecurityUtils;
+import com.izouma.zhirongip.annotations.OperLog;
+import com.izouma.zhirongip.domain.ExceptionLog;
+import com.izouma.zhirongip.domain.OperationLog;
+import com.izouma.zhirongip.domain.User;
+import com.izouma.zhirongip.repo.ExceptionLogRepo;
+import com.izouma.zhirongip.repo.OperationLogRepo;
+import com.izouma.zhirongip.utils.IPUtils;
+import com.izouma.zhirongip.utils.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.AfterThrowing;
@@ -22,7 +20,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 
 
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -42,14 +39,14 @@ public class OperLogAspect {
     /**
     /**
      * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
      * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
      */
      */
-    @Pointcut("@annotation(com.izouma.yzzscq.annotations.OperLog)")
+    @Pointcut("@annotation(com.izouma.zhirongip.annotations.OperLog)")
     public void operLogPointCut() {
     public void operLogPointCut() {
     }
     }
 
 
     /**
     /**
      * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
      * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
      */
      */
-    @Pointcut("execution(* com.izouma.yzzscq.web..*.*(..))")
+    @Pointcut("execution(* com.izouma.zhirongip.web..*.*(..))")
     public void operExceptionLogPointCut() {
     public void operExceptionLogPointCut() {
     }
     }
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/CacheConfig.java → src/main/java/com/izouma/zhirongip/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.annotation.EnableCaching;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/Constants.java → src/main/java/com/izouma/zhirongip/config/Constants.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 public interface Constants {
 public interface Constants {
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/DateConfig.java → src/main/java/com/izouma/zhirongip/config/DateConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/LocalDateTimeSerializerConfig.java → src/main/java/com/izouma/zhirongip/config/LocalDateTimeSerializerConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;

+ 3 - 4
src/main/java/com/izouma/yzzscq/config/SpringSecurityAuditorAware.java → src/main/java/com/izouma/zhirongip/config/SpringSecurityAuditorAware.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
-
-import com.izouma.yzzscq.domain.User;
-import com.izouma.yzzscq.utils.SecurityUtils;
+import com.izouma.zhirongip.domain.User;
+import com.izouma.zhirongip.utils.SecurityUtils;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WebMvcConfig.java → src/main/java/com/izouma/zhirongip/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WxMaConfiguration.java → src/main/java/com/izouma/zhirongip/config/WxMaConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WxMaProperties.java → src/main/java/com/izouma/zhirongip/config/WxMaProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import lombok.Data;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 3
src/main/java/com/izouma/yzzscq/config/WxMpConfiguration.java → src/main/java/com/izouma/zhirongip/config/WxMpConfiguration.java

@@ -1,7 +1,6 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
-
-import com.izouma.yzzscq.mpHandler.LogHandler;
+import com.izouma.zhirongip.mpHandler.LogHandler;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.WxMpService;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WxMpProperties.java → src/main/java/com/izouma/zhirongip/config/WxMpProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import lombok.Data;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WxPayConfiguration.java → src/main/java/com/izouma/zhirongip/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.WxPayService;

+ 1 - 1
src/main/java/com/izouma/yzzscq/config/WxPayProperties.java → src/main/java/com/izouma/zhirongip/config/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.config;
+package com.izouma.zhirongip.config;
 
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 2 - 3
src/main/java/com/izouma/yzzscq/converter/FileObjectConverter.java → src/main/java/com/izouma/zhirongip/converter/FileObjectConverter.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.converter;
-
+package com.izouma.zhirongip.converter;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.izouma.yzzscq.domain.FileObject;
+import com.izouma.zhirongip.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.AttributeConverter;

+ 2 - 3
src/main/java/com/izouma/yzzscq/converter/FileObjectListConverter.java → src/main/java/com/izouma/zhirongip/converter/FileObjectListConverter.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.converter;
-
+package com.izouma.zhirongip.converter;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.izouma.yzzscq.domain.FileObject;
+import com.izouma.zhirongip.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.AttributeConverter;

+ 1 - 2
src/main/java/com/izouma/yzzscq/converter/JSONObjectConverter.java → src/main/java/com/izouma/zhirongip/converter/JSONObjectConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.converter;
+package com.izouma.zhirongip.converter;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j;
 
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.AttributeConverter;
 
 
-
 @Slf4j
 @Slf4j
 public class JSONObjectConverter implements AttributeConverter<JSONObject, String> {
 public class JSONObjectConverter implements AttributeConverter<JSONObject, String> {
     @Override
     @Override

+ 2 - 5
src/main/java/com/izouma/yzzscq/converter/LongArrayConverter.java → src/main/java/com/izouma/zhirongip/converter/LongArrayConverter.java

@@ -1,9 +1,7 @@
-package com.izouma.yzzscq.converter;
-
+package com.izouma.zhirongip.converter;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
-
 import javax.persistence.AttributeConverter;
 import javax.persistence.AttributeConverter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
@@ -13,9 +11,8 @@ import java.util.stream.Collectors;
 public class LongArrayConverter implements AttributeConverter<List<Long>, String> {
 public class LongArrayConverter implements AttributeConverter<List<Long>, String> {
     @Override
     @Override
     public String convertToDatabaseColumn(List<Long> longs) {
     public String convertToDatabaseColumn(List<Long> longs) {
-        if (longs != null && !longs.isEmpty()) {
+        if (longs != null && !longs.isEmpty())
             return StringUtils.join(longs, ",");
             return StringUtils.join(longs, ",");
-        }
         return null;
         return null;
     }
     }
 
 

+ 2 - 3
src/main/java/com/izouma/yzzscq/converter/NumOfIpListConverter.java → src/main/java/com/izouma/zhirongip/converter/NumOfIpListConverter.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.converter;
-
+package com.izouma.zhirongip.converter;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-import com.izouma.yzzscq.domain.resource.NumOfIp;
+import com.izouma.zhirongip.domain.resource.NumOfIp;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.AttributeConverter;

+ 1 - 3
src/main/java/com/izouma/yzzscq/converter/StringArrayConverter.java → src/main/java/com/izouma/zhirongip/converter/StringArrayConverter.java

@@ -1,5 +1,4 @@
-package com.izouma.yzzscq.converter;
-
+package com.izouma.zhirongip.converter;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 
@@ -8,7 +7,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
-
 public class StringArrayConverter implements AttributeConverter<List<String>, String> {
 public class StringArrayConverter implements AttributeConverter<List<String>, String> {
     @Override
     @Override
     public String convertToDatabaseColumn(List<String> strings) {
     public String convertToDatabaseColumn(List<String> strings) {

+ 1 - 1
src/main/java/com/izouma/yzzscq/converter/StringToMapConverter.java → src/main/java/com/izouma/zhirongip/converter/StringToMapConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.converter;
+package com.izouma.zhirongip.converter;
 
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/AuditedEntity.java → src/main/java/com/izouma/zhirongip/domain/AuditedEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

+ 4 - 1
src/main/java/com/izouma/yzzscq/domain/Banner.java → src/main/java/com/izouma/zhirongip/domain/Banner.java

@@ -1,11 +1,14 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
+import com.izouma.zhirongip.enums.NavType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.Where;
 
 
 import javax.persistence.*;
 import javax.persistence.*;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/BaseEntity.java → src/main/java/com/izouma/zhirongip/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;

+ 3 - 4
src/main/java/com/izouma/yzzscq/domain/District.java → src/main/java/com/izouma/zhirongip/domain/District.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.enums.DistrictLevel;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.enums.DistrictLevel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/ExceptionLog.java → src/main/java/com/izouma/zhirongip/domain/ExceptionLog.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/FileObject.java → src/main/java/com/izouma/zhirongip/domain/FileObject.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/Information.java → src/main/java/com/izouma/zhirongip/domain/Information.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

+ 4 - 5
src/main/java/com/izouma/yzzscq/domain/Institution.java → src/main/java/com/izouma/zhirongip/domain/Institution.java

@@ -1,9 +1,8 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.InstitutionalNature;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.InstitutionalNature;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 3 - 4
src/main/java/com/izouma/yzzscq/domain/Menu.java → src/main/java/com/izouma/zhirongip/domain/Menu.java

@@ -1,9 +1,8 @@
-package com.izouma.yzzscq.domain;
-
+package com.izouma.zhirongip.domain;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.dto.MenuDTO;
-import com.izouma.yzzscq.security.Authority;
+import com.izouma.zhirongip.dto.MenuDTO;
+import com.izouma.zhirongip.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 5 - 6
src/main/java/com/izouma/yzzscq/domain/Message.java → src/main/java/com/izouma/zhirongip/domain/Message.java

@@ -1,12 +1,11 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.enums.DocumentType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.enums.DocumentType;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 3 - 4
src/main/java/com/izouma/yzzscq/domain/Navigation.java → src/main/java/com/izouma/zhirongip/domain/Navigation.java

@@ -1,8 +1,7 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
-
-import com.izouma.yzzscq.enums.NavAuth;
-import com.izouma.yzzscq.enums.NavType;
+import com.izouma.zhirongip.enums.NavAuth;
+import com.izouma.zhirongip.enums.NavType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/OperationLog.java → src/main/java/com/izouma/zhirongip/domain/OperationLog.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 2 - 3
src/main/java/com/izouma/yzzscq/domain/Partner.java → src/main/java/com/izouma/zhirongip/domain/Partner.java

@@ -1,7 +1,6 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
-
-import com.izouma.yzzscq.enums.PartnerType;
+import com.izouma.zhirongip.enums.PartnerType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 3 - 3
src/main/java/com/izouma/yzzscq/domain/Personal.java → src/main/java/com/izouma/zhirongip/domain/Personal.java

@@ -1,7 +1,7 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.DocumentType;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.DocumentType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/ServiceDetail.java → src/main/java/com/izouma/zhirongip/domain/ServiceDetail.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/Setting.java → src/main/java/com/izouma/zhirongip/domain/Setting.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/SmsRecord.java → src/main/java/com/izouma/zhirongip/domain/SmsRecord.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/Statistic.java → src/main/java/com/izouma/zhirongip/domain/Statistic.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

+ 4 - 5
src/main/java/com/izouma/yzzscq/domain/SuperUser.java → src/main/java/com/izouma/zhirongip/domain/SuperUser.java

@@ -1,11 +1,10 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.config.Constants;
-import com.izouma.yzzscq.security.Authority;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.config.Constants;
+import com.izouma.zhirongip.security.Authority;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/SysConfig.java → src/main/java/com/izouma/zhirongip/domain/SysConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/TestClass.java → src/main/java/com/izouma/zhirongip/domain/TestClass.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 4 - 5
src/main/java/com/izouma/yzzscq/domain/User.java → src/main/java/com/izouma/zhirongip/domain/User.java

@@ -1,11 +1,10 @@
-package com.izouma.yzzscq.domain;
+package com.izouma.zhirongip.domain;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.config.Constants;
-import com.izouma.yzzscq.security.Authority;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.config.Constants;
+import com.izouma.zhirongip.security.Authority;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 7 - 8
src/main/java/com/izouma/yzzscq/domain/demand/CopyrightDemand.java → src/main/java/com/izouma/zhirongip/domain/demand/CopyrightDemand.java

@@ -1,22 +1,21 @@
-package com.izouma.yzzscq.domain.demand;
-
+package com.izouma.zhirongip.domain.demand;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CopyrightType;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.CopyrightType;
+import com.izouma.zhirongip.enums.TradingMethod;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.Where;
 
 
-
 import javax.persistence.*;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 

+ 6 - 8
src/main/java/com/izouma/yzzscq/domain/demand/Funding.java → src/main/java/com/izouma/zhirongip/domain/demand/Funding.java

@@ -1,16 +1,14 @@
-package com.izouma.yzzscq.domain.demand;
-
+package com.izouma.zhirongip.domain.demand;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.converter.LongArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.LoanTerm;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.converter.LongArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.LoanTerm;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 7 - 6
src/main/java/com/izouma/yzzscq/domain/demand/LogoDemand.java → src/main/java/com/izouma/zhirongip/domain/demand/LogoDemand.java

@@ -1,13 +1,14 @@
-package com.izouma.yzzscq.domain.demand;
-
+package com.izouma.zhirongip.domain.demand;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.TradingMethod;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 7 - 8
src/main/java/com/izouma/yzzscq/domain/demand/PatentDemand.java → src/main/java/com/izouma/zhirongip/domain/demand/PatentDemand.java

@@ -1,15 +1,14 @@
-package com.izouma.yzzscq.domain.demand;
-
+package com.izouma.zhirongip.domain.demand;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CaseType;
-import com.izouma.yzzscq.enums.OwnerType;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.*;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 4 - 9
src/main/java/com/izouma/yzzscq/domain/demand/TechProductDemand.java → src/main/java/com/izouma/zhirongip/domain/demand/TechProductDemand.java

@@ -1,16 +1,11 @@
-package com.izouma.yzzscq.domain.demand;
-
+package com.izouma.zhirongip.domain.demand;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.PatentType;
-import com.izouma.yzzscq.enums.Stage;
-import com.izouma.yzzscq.enums.TpType;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 8 - 13
src/main/java/com/izouma/yzzscq/domain/resource/Company.java → src/main/java/com/izouma/zhirongip/domain/resource/Company.java

@@ -1,27 +1,22 @@
-package com.izouma.yzzscq.domain.resource;
+package com.izouma.zhirongip.domain.resource;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.annotations.SearchableOne;
-import com.izouma.yzzscq.converter.LongArrayConverter;
-import com.izouma.yzzscq.converter.NumOfIpListConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.dto.CompanyDTO;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.annotations.SearchableOne;
+import com.izouma.zhirongip.converter.LongArrayConverter;
+import com.izouma.zhirongip.converter.NumOfIpListConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.dto.CompanyDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.Where;
 
 
-
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 

+ 7 - 10
src/main/java/com/izouma/yzzscq/domain/resource/Digital.java → src/main/java/com/izouma/zhirongip/domain/resource/Digital.java

@@ -1,18 +1,16 @@
-package com.izouma.yzzscq.domain.resource;
-
+package com.izouma.zhirongip.domain.resource;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.annotations.SearchableOne;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.dto.ProductDTO;
-import com.izouma.yzzscq.dto.TechnologyDTO;
-import com.izouma.yzzscq.enums.DigitalType;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.annotations.SearchableOne;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.dto.ProductDTO;
+import com.izouma.zhirongip.dto.TechnologyDTO;
+import com.izouma.zhirongip.enums.DigitalType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -21,7 +19,6 @@ import org.hibernate.annotations.Where;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 
 
-
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor

+ 6 - 7
src/main/java/com/izouma/yzzscq/domain/resource/Expert.java → src/main/java/com/izouma/zhirongip/domain/resource/Expert.java

@@ -1,14 +1,13 @@
-package com.izouma.yzzscq.domain.resource;
+package com.izouma.zhirongip.domain.resource;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.annotations.SearchableOne;
-import com.izouma.yzzscq.converter.LongArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.dto.ExpertDTO;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.annotations.SearchableOne;
+import com.izouma.zhirongip.converter.LongArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.dto.ExpertDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 7 - 9
src/main/java/com/izouma/yzzscq/domain/resource/IntellectualProperty.java → src/main/java/com/izouma/zhirongip/domain/resource/IntellectualProperty.java

@@ -1,15 +1,13 @@
-package com.izouma.yzzscq.domain.resource;
+package com.izouma.zhirongip.domain.resource;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
-
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.annotations.SearchableOne;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.domain.Setting;
-import com.izouma.yzzscq.dto.IntellectualPropertyDTO;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.annotations.SearchableOne;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.domain.Setting;
+import com.izouma.zhirongip.dto.IntellectualPropertyDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
-
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/yzzscq/domain/resource/NumOfIp.java → src/main/java/com/izouma/zhirongip/domain/resource/NumOfIp.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.domain.resource;
+package com.izouma.zhirongip.domain.resource;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

+ 8 - 12
src/main/java/com/izouma/yzzscq/domain/resource/PolicyLaw.java → src/main/java/com/izouma/zhirongip/domain/resource/PolicyLaw.java

@@ -1,17 +1,15 @@
-package com.izouma.yzzscq.domain.resource;
-
+package com.izouma.zhirongip.domain.resource;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.annotations.SearchableOne;
-import com.izouma.yzzscq.converter.FileObjectListConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.domain.FileObject;
-import com.izouma.yzzscq.domain.Setting;
-import com.izouma.yzzscq.enums.ResourceCategory;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.annotations.SearchableOne;
+import com.izouma.zhirongip.converter.FileObjectListConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.domain.FileObject;
+import com.izouma.zhirongip.domain.Setting;
+import com.izouma.zhirongip.enums.ResourceCategory;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -20,12 +18,10 @@ import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.Where;
 
 
-
 import javax.persistence.*;
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
-
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor

+ 9 - 12
src/main/java/com/izouma/yzzscq/domain/resource/Purchase.java → src/main/java/com/izouma/zhirongip/domain/resource/Purchase.java

@@ -1,18 +1,15 @@
-package com.izouma.yzzscq.domain.resource;
-
-
-
+package com.izouma.zhirongip.domain.resource;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.domain.Setting;
-import com.izouma.yzzscq.enums.PurchaseItem;
-import com.izouma.yzzscq.enums.PurchaseType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.domain.Setting;
+import com.izouma.zhirongip.enums.PurchaseItem;
+import com.izouma.zhirongip.enums.PurchaseType;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 10 - 12
src/main/java/com/izouma/yzzscq/domain/resource/SuccessCase.java → src/main/java/com/izouma/zhirongip/domain/resource/SuccessCase.java

@@ -1,20 +1,18 @@
-package com.izouma.yzzscq.domain.resource;
-
+package com.izouma.zhirongip.domain.resource;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.domain.Setting;
-import com.izouma.yzzscq.enums.CaseCategory;
-import com.izouma.yzzscq.enums.LogoType;
-import com.izouma.yzzscq.enums.PatentType;
-import com.izouma.yzzscq.enums.TechTradingMethod;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.domain.Setting;
+import com.izouma.zhirongip.enums.CaseCategory;
+import com.izouma.zhirongip.enums.LogoType;
+import com.izouma.zhirongip.enums.PatentType;
+import com.izouma.zhirongip.enums.TechTradingMethod;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 10 - 11
src/main/java/com/izouma/yzzscq/domain/supply/Copyright.java → src/main/java/com/izouma/zhirongip/domain/supply/Copyright.java

@@ -1,19 +1,18 @@
-package com.izouma.yzzscq.domain.supply;
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CommissionType;
-import com.izouma.yzzscq.enums.CopyrightType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.CommissionType;
+import com.izouma.zhirongip.enums.CopyrightType;
+import com.izouma.zhirongip.enums.TradingMethod;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 7 - 10
src/main/java/com/izouma/yzzscq/domain/supply/Logo.java → src/main/java/com/izouma/zhirongip/domain/supply/Logo.java

@@ -1,16 +1,13 @@
-package com.izouma.yzzscq.domain.supply;
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CommissionType;
-import com.izouma.yzzscq.enums.LogoType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.*;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 7 - 11
src/main/java/com/izouma/yzzscq/domain/supply/Patent.java → src/main/java/com/izouma/zhirongip/domain/supply/Patent.java

@@ -1,17 +1,13 @@
-package com.izouma.yzzscq.domain.supply;
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CaseType;
-import com.izouma.yzzscq.enums.CommissionType;
-import com.izouma.yzzscq.enums.OwnerType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.*;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 4 - 5
src/main/java/com/izouma/yzzscq/domain/supply/ServiceProvider.java → src/main/java/com/izouma/zhirongip/domain/supply/ServiceProvider.java

@@ -1,10 +1,9 @@
-package com.izouma.yzzscq.domain.supply;
-
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.LongArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.LongArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 9 - 7
src/main/java/com/izouma/yzzscq/domain/supply/TechnicalManager.java → src/main/java/com/izouma/zhirongip/domain/supply/TechnicalManager.java

@@ -1,13 +1,15 @@
-package com.izouma.yzzscq.domain.supply;
-
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.LongArrayConverter;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.LongArrayConverter;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.AreaOfAffiliation;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 7 - 10
src/main/java/com/izouma/yzzscq/domain/supply/TechnologyProduct.java → src/main/java/com/izouma/zhirongip/domain/supply/TechnologyProduct.java

@@ -1,16 +1,13 @@
-package com.izouma.yzzscq.domain.supply;
+package com.izouma.zhirongip.domain.supply;
 
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.izouma.yzzscq.annotations.EnumFormat;
-import com.izouma.yzzscq.annotations.Searchable;
-import com.izouma.yzzscq.converter.StringArrayConverter;
-import com.izouma.yzzscq.domain.BaseEntity;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.CommissionType;
-import com.izouma.yzzscq.enums.Stage;
-import com.izouma.yzzscq.enums.TpType;
-import com.izouma.yzzscq.utils.excel.EnumExcelConverter;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import com.izouma.zhirongip.annotations.Searchable;
+import com.izouma.zhirongip.converter.StringArrayConverter;
+import com.izouma.zhirongip.domain.BaseEntity;
+import com.izouma.zhirongip.enums.*;
+import com.izouma.zhirongip.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/Captcha.java → src/main/java/com/izouma/zhirongip/dto/Captcha.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;

+ 4 - 5
src/main/java/com/izouma/yzzscq/dto/CompanyDTO.java → src/main/java/com/izouma/zhirongip/dto/CompanyDTO.java

@@ -1,12 +1,11 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;
-
-import com.izouma.yzzscq.domain.resource.Company;
-import com.izouma.yzzscq.utils.excel.BooleanConverter;
-import com.izouma.yzzscq.utils.excel.LocalDateTimeConverter;
+import com.izouma.zhirongip.domain.resource.Company;
+import com.izouma.zhirongip.utils.excel.BooleanConverter;
+import com.izouma.zhirongip.utils.excel.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/DemandDTO.java → src/main/java/com/izouma/zhirongip/dto/DemandDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 2 - 2
src/main/java/com/izouma/yzzscq/dto/ExpertDTO.java → src/main/java/com/izouma/zhirongip/dto/ExpertDTO.java

@@ -1,8 +1,8 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;
-import com.izouma.yzzscq.utils.excel.LocalDateConverter;
+import com.izouma.zhirongip.utils.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 7 - 6
src/main/java/com/izouma/yzzscq/dto/InstitutionDTO.java → src/main/java/com/izouma/zhirongip/dto/InstitutionDTO.java

@@ -1,13 +1,12 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.domain.Institution;
-import com.izouma.yzzscq.domain.User;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.InstitutionalNature;
+import com.izouma.zhirongip.domain.Institution;
+import com.izouma.zhirongip.domain.User;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.InstitutionalNature;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -15,6 +14,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import java.time.LocalDate;
 import java.time.LocalDate;
 
 
 @Data
 @Data

+ 3 - 5
src/main/java/com/izouma/yzzscq/dto/IntellectualPropertyDTO.java → src/main/java/com/izouma/zhirongip/dto/IntellectualPropertyDTO.java

@@ -1,11 +1,10 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;
-
-import com.izouma.yzzscq.domain.resource.IntellectualProperty;
-import com.izouma.yzzscq.utils.excel.LocalDateConverter;
+import com.izouma.zhirongip.domain.resource.IntellectualProperty;
+import com.izouma.zhirongip.utils.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -14,7 +13,6 @@ import lombok.NoArgsConstructor;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
 
 
-
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/MenuDTO.java → src/main/java/com/izouma/zhirongip/dto/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 public interface MenuDTO {
 public interface MenuDTO {
     Long getId();
     Long getId();

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/PageQuery.java → src/main/java/com/izouma/zhirongip/dto/PageQuery.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

+ 5 - 6
src/main/java/com/izouma/yzzscq/dto/PersonalDTO.java → src/main/java/com/izouma/zhirongip/dto/PersonalDTO.java

@@ -1,13 +1,12 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-
-import com.izouma.yzzscq.domain.Personal;
-import com.izouma.yzzscq.domain.User;
-import com.izouma.yzzscq.enums.ApplyStatus;
-import com.izouma.yzzscq.enums.DocumentType;
+import com.izouma.zhirongip.domain.Personal;
+import com.izouma.zhirongip.domain.User;
+import com.izouma.zhirongip.enums.ApplyStatus;
+import com.izouma.zhirongip.enums.DocumentType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;

+ 2 - 3
src/main/java/com/izouma/yzzscq/dto/ProductDTO.java → src/main/java/com/izouma/zhirongip/dto/ProductDTO.java

@@ -1,10 +1,9 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;
-
-import com.izouma.yzzscq.domain.resource.Digital;
+import com.izouma.zhirongip.domain.resource.Digital;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/SearchDTO.java → src/main/java/com/izouma/zhirongip/dto/SearchDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/TechnologyDTO.java → src/main/java/com/izouma/zhirongip/dto/TechnologyDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;

+ 2 - 3
src/main/java/com/izouma/yzzscq/dto/UserRegister.java → src/main/java/com/izouma/zhirongip/dto/UserRegister.java

@@ -1,9 +1,8 @@
-package com.izouma.yzzscq.dto;
+package com.izouma.zhirongip.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
-
-import com.izouma.yzzscq.security.Authority;
+import com.izouma.zhirongip.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/excel/PatentExcel.java → src/main/java/com/izouma/zhirongip/dto/excel/PatentExcel.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto.excel;
+package com.izouma.zhirongip.dto.excel;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.BaseRowModel;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/gen/GenCode.java → src/main/java/com/izouma/zhirongip/dto/gen/GenCode.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto.gen;
+package com.izouma.zhirongip.dto.gen;
 
 
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/gen/Subtable.java → src/main/java/com/izouma/zhirongip/dto/gen/Subtable.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto.gen;
+package com.izouma.zhirongip.dto.gen;
 
 
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/yzzscq/dto/gen/TableField.java → src/main/java/com/izouma/zhirongip/dto/gen/TableField.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.dto.gen;
+package com.izouma.zhirongip.dto.gen;
 
 
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/ApplyStatus.java → src/main/java/com/izouma/zhirongip/enums/ApplyStatus.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum ApplyStatus {
 public enum ApplyStatus {
     PASS("通过"),
     PASS("通过"),

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/AreaOfAffiliation.java → src/main/java/com/izouma/zhirongip/enums/AreaOfAffiliation.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum AreaOfAffiliation {
 public enum AreaOfAffiliation {
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/AuthorityName.java → src/main/java/com/izouma/zhirongip/enums/AuthorityName.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum AuthorityName {
 public enum AuthorityName {
     ROLE_USER("普通用户"),
     ROLE_USER("普通用户"),

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/CaseCategory.java → src/main/java/com/izouma/zhirongip/enums/CaseCategory.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum CaseCategory {
 public enum CaseCategory {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/CaseType.java → src/main/java/com/izouma/zhirongip/enums/CaseType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum CaseType {
 public enum CaseType {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/CommissionType.java → src/main/java/com/izouma/zhirongip/enums/CommissionType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 /*
 /*
 佣金类型
 佣金类型

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/CopyrightType.java → src/main/java/com/izouma/zhirongip/enums/CopyrightType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum CopyrightType {
 public enum CopyrightType {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/DigitalType.java → src/main/java/com/izouma/zhirongip/enums/DigitalType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum DigitalType {
 public enum DigitalType {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/DistrictLevel.java → src/main/java/com/izouma/zhirongip/enums/DistrictLevel.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum DistrictLevel {
 public enum DistrictLevel {
     PROVINCE(1),
     PROVINCE(1),

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/DocumentType.java → src/main/java/com/izouma/zhirongip/enums/DocumentType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum DocumentType {
 public enum DocumentType {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/InstitutionalNature.java → src/main/java/com/izouma/zhirongip/enums/InstitutionalNature.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum InstitutionalNature {
 public enum InstitutionalNature {
     MILITARY_INDUSTRY("军工单位"),
     MILITARY_INDUSTRY("军工单位"),

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/IntePropLawStatus.java → src/main/java/com/izouma/zhirongip/enums/IntePropLawStatus.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum IntePropLawStatus {
 public enum IntePropLawStatus {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/IntePropertyType.java → src/main/java/com/izouma/zhirongip/enums/IntePropertyType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum IntePropertyType {
 public enum IntePropertyType {
     /*
     /*

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/LawStatus.java → src/main/java/com/izouma/zhirongip/enums/LawStatus.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 public enum LawStatus {
 public enum LawStatus {
 
 

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/LoanTerm.java → src/main/java/com/izouma/zhirongip/enums/LoanTerm.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 /*
 /*
 贷款期限
 贷款期限

+ 1 - 1
src/main/java/com/izouma/yzzscq/enums/LogoType.java → src/main/java/com/izouma/zhirongip/enums/LogoType.java

@@ -1,4 +1,4 @@
-package com.izouma.yzzscq.enums;
+package com.izouma.zhirongip.enums;
 
 
 /*
 /*
 商标类型
 商标类型

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików