同步(重庆)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java

@@ -56,6 +56,11 @@ public class SkService extends Model<SkService> {
     private String content;
 
     /**
+     * 服务来源
+     */
+    private String fwly;
+
+    /**
      * 服务类型
      */
     private String servicetypename;

common/common_utils/src/main/java/com/founder/commonutils/model/vo/response/SkServiceApplyVO.java

@@ -2,10 +2,14 @@ package com.founder.commonutils.model.vo.response;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.founder.commonutils.model.newPublicEntity.SkServiceApply;
 import com.founder.commonutils.util.StringUtil;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @author jlt
@@ -46,6 +50,15 @@ public class SkServiceApplyVO {
      */
     private String content;
 
+    /**
+     * 申请时间
+     */
+    private String sqsj;
+    /**
+     * 授权时间
+     */
+    private String ssqsj;
+
     public SkServiceApplyVO(){}
     public SkServiceApplyVO(SkServiceApply skServiceApply, String name,String ms){
         BeanUtils.copyProperties(skServiceApply,this);

common/service_base/src/main/java/com/founder/servicebase/logs/mapper/mysqlMapper/SkServiceApplyMapper.xml

@@ -24,7 +24,7 @@
 
     <select id="findAll" resultType="com.founder.commonutils.model.vo.response.SkServiceApplyVO">
         select a.xxzjbh, serviceMs,serviceName,serviceId, applyGs, applyRy, applyUrl, time, token, a.content,
-        a.isDeleted, sqsj, a.status
+        a.isDeleted, sqsj,ssqsj, a.status
         from sk_service_apply a left join sk_service b on a.serviceId=b.xxzjbh
         where a.isDeleted='0'
         <if test="servicename!= null and servicename!=''">