ly преди 1 година
родител
ревизия
58cc37d30b

+ 2 - 0
src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInput.java

@@ -241,4 +241,6 @@ public class BizArchiveInput extends BaseEntity {
     private Integer isQualified;
     @TableField(exist = false)
     private Integer isOther;
+    @TableField(exist = false)
+    private Long customerLabelId;
 }

+ 1 - 1
src/main/java/cn/ezhizao/project/business/order/domain/OrderExcelImportLoopModel.java

@@ -98,7 +98,7 @@ public class OrderExcelImportLoopModel {
     // 公积金赠送月数
     @Excel(name = "公积金赠送月数")
     private Integer housingFundFreeMonth;
-    @Excel(name = "社保赠送金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
+    @Excel(name = "公积金赠送金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal housingFundFreeAmount;
     @Excel(name = "公积金开始月")
     private Date housingFundStartMonth;

+ 2 - 2
src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
     cloud:
         nacos:
             discovery:
-                server-addr: 154.8.178.69:8848 # Nacos服务器地址
+                server-addr: 82.156.209.15:8848 # Nacos服务器地址
     application:
         name: ezhizao-yzbh-crm
     # redis 配置
@@ -34,7 +34,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://154.8.178.69:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://82.156.209.15:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
                 username: admin
                 password: admin
 #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8

+ 1 - 0
src/main/resources/mybatis/business/BizArchiveInputMapper.xml

@@ -46,6 +46,7 @@
         SELECT
         t1.*,
         t2.name as company_name,
+        t2.customer_label_id as customerLabelId,
         t2.social_credit_code as social_credit_code,
         t3.nick_name as signer_name,
         t4.title as source_category_name,