Explorar o código

修复合同导出异常问题

udream-cxs %!s(int64=4) %!d(string=hai) anos
pai
achega
b384e8b434

+ 1 - 1
lift-business-service/src/main/resources/mapper/contract/ContractsMapper.xml

@@ -353,7 +353,7 @@
         case c.source when 1 then '商保新增' when 2 then '免保转签' when 3 then '续签' when 4 then '免保' else '暂无' end as source,
 
         <!--合同类型-->
-        case c.type when 1 then '半包' when 2 then '半包' when 3 then '清包' when 4 then '全包' when 5 then '大修' else '暂无' end as type
+        case c.type when 1 then '半包' when 2 then '半包' when 3 then '清包' when 4 then '全包' when 5 then '大修' else '暂无' end as type,
 
         <!--合同开始时间-->
         c.star_date as starDate,

+ 9 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/expertPunish/mapper/bean/ExpertsPunishmentVo.java

@@ -0,0 +1,9 @@
+package cn.com.ty.lift.ud.expertPunish.mapper.bean;
+
+import cn.com.ty.lift.ud.expertPunish.mapper.entity.ExpertsPunishment;
+import lombok.Data;
+
+@Data
+public class ExpertsPunishmentVo extends ExpertsPunishment {
+    private String chargeName;
+}

+ 0 - 3
lift-ud-service/src/main/java/cn/com/ty/lift/ud/pay/alipay/AlipayConfig.java

@@ -22,9 +22,6 @@ import lombok.Data;
 @Data
 @Component
 @PropertySource(value = "alipay/alipay-online.properties")//正式环境
-//@PropertySource(value = "alipay/alipay_pc.properties")
-//@PropertySource(value = "alipay/alipay-app.properties")
-//@PropertySource(value = "alipay/alipay-test.properties")//本地测试正式环境
 @ConfigurationProperties(prefix = "alipay")
 public class AlipayConfig {