Explorar o código

修改接口调整

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
44f3383754

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -420,12 +420,12 @@
 
 	<select id="selectPatentNewList"
 		resultType="com.goafanti.patent.bo.PatentNewBo">
-		select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders
+		  select a.id,a.patent_no as patentNo,a.name,a.type,a.status,a.holders
 		,a.inventor ,a.annual_fee_status annualFeeStatus,
 		date_format(a.apply_date,'%Y-%m-%d') as
 		applyDates,a.uid,a.salesman_remind salesmanRemind,
 		date_format(a.authorization_date ,'%Y-%m-%d ')as
-		authorizationDates,a.province,
+		authorizationDates,a.province,a.years ,
 		a.applicant,a.contact_mobile as contactMobile,a.email,a.certificate_url as certificateUrl,
 		date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as
 		createTimeS,a.apply_date as applyDate,

+ 0 - 1
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -32,7 +32,6 @@ import com.goafanti.common.dao.PatentYearPaymentMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.PatentLog;
 import com.goafanti.common.model.PatentNew;
 import com.goafanti.common.model.PatentNewLog;
 import com.goafanti.common.model.PatentPaymentDetails;

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -65,12 +65,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//172.16.0.253/1.1.78
-#avatar.host=//172.16.0.253
+static.host=//172.16.0.253/1.1.81
+avatar.host=//172.16.0.253
 
 
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.81
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.81
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7