Merge branch 'zhangxin'

src/main/java/com/qtzl/alterSales/dao/entity/second/AflVehicleWhite.java

 package com.qtzl.alterSales.dao.entity.second;
 
 import cn.com.taiji.common.entity.StringUUIDEntity;
+import com.qtzl.alterSales.manager.model.protocol.center.excel.ExcelExport;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 @Table(name="AFL_VEHICLE_WHITE")
 public class AflVehicleWhite extends StringUUIDEntity {
     /** 车牌号 */
+    @ExcelExport("车牌号")
     private String plateNum ;
     /** 车牌颜色 */
+    @ExcelExport(value = "车牌颜色",kv = "0-蓝色;1-黄色;2-黑色;3-白色;4-渐变绿色;5-黄绿双拼色;6-蓝白渐变色;7-临时牌照;9-未确定;11-绿色;12-红色")
     private Integer plateColor ;
     /** 是否收取签约服务费(0-是;1-否) */
+    @ExcelExport(value = "是否收取签约服务费",kv = "0-是;1-否")
     private Integer isCollectSignService ;
     /** 是否收取通行服务费(0-是;1-否) */
+    @ExcelExport(value = "是否收取通行服务费",kv = "0-是;1-否")
     private Integer isCollectPasswordService ;
     /** 是否删除(0_正常,1_删除) */
     private Integer isDelete ;
     /** 创建人 */
     private String creator ;
     /** 创建时间 */
+    @ExcelExport("创建时间")
     private Date insertTime ;
     /** 修改人 */
     private String updator ;

src/main/java/com/qtzl/alterSales/manager/handler/AflNoticeTemplateInfoFindPageHandler.java

 import com.qtzl.alterSales.manager.model.protocol.UcServiceError;
 import com.qtzl.alterSales.manager.model.protocol.sales.AflNoticeTemplateInfoFindPageRequest;
 import com.qtzl.alterSales.manager.model.protocol.sales.AflNoticeTemplateInfoFindPageViewRequest;
-import com.qtzl.alterSales.manager.model.protocol.sales.AflSignReboundInfoFindPageViewResponse;
+import com.qtzl.alterSales.manager.model.protocol.sales.AflNoticeTemplateInfoFindPageViewResponse;
 import com.qtzl.alterSales.manager.service.AfterSalesCmd;
-import com.qtzl.alterSales.manager.vo.AflSignReboundInfoVo;
+import com.qtzl.alterSales.manager.vo.AflNoticeTemplateInfoVo;
 import com.txffp.api.core.manager.comm.annotation.ApiHandler;
 import org.springframework.stereotype.Service;
 
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("查询通知模板配置管理失败");
         }
     }
-    private AflSignReboundInfoFindPageViewResponse toResponse(Pagination pagination) {
-        final AflSignReboundInfoFindPageViewResponse response = new AflSignReboundInfoFindPageViewResponse();
+    private AflNoticeTemplateInfoFindPageViewResponse toResponse(Pagination pagination) {
+        final AflNoticeTemplateInfoFindPageViewResponse response = new AflNoticeTemplateInfoFindPageViewResponse();
         BeanTools.copyProperties(pagination, response);
         if (isEmpty(pagination.getResult())) {
             return response;
         }
-        response.setData(pagination.getResult(AflSignReboundInfoVo.class));
+        response.setData(pagination.getResult(AflNoticeTemplateInfoVo.class));
         return response;
     }
 

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflNoticeTemplateInfoFindPageViewResponse.java

 package com.qtzl.alterSales.manager.model.protocol.sales;
 
 import com.qtzl.alterSales.manager.model.protocol.AbstractAfterSalesPageResponse;
-import com.qtzl.alterSales.manager.vo.AflSignReboundInfoVo;
+import com.qtzl.alterSales.manager.vo.AflNoticeTemplateInfoVo;
 
-public class AflNoticeTemplateInfoFindPageViewResponse extends AbstractAfterSalesPageResponse<AflSignReboundInfoVo> {
+public class AflNoticeTemplateInfoFindPageViewResponse extends AbstractAfterSalesPageResponse<AflNoticeTemplateInfoVo> {
 }

src/main/resources/application-prod.yml

 
 zt:
   #  内网地址
-  #  url=http://192.168.100.148:20801
+   url=http://192.168.101.25:8035
   #  外网地址
-  url: https://medusa.hltgz.com
+#  url: https://medusa.hltgz.com
   appId: f344651a-9708-4e7d-bcae-9fd149c81b8b
   token: 0
   zip: 0