Merge branch 'dev' of http://47.101.143.145:8090/77975466/pco into dev

sp-admin/sa-view/tb-business-car/tb-business-car-list.html

@@ -27,7 +27,7 @@
 					<sa-td name="车辆规格" prop="carSize"></sa-td>
 					<sa-td width="130" name="支付状态" prop="pay" type="enum" :jv="{0: '未支付[#ff0000]', 1: '已支付[#005500]'}">
 					</sa-td>
-					<sa-td width="130" name="车辆状态" prop="pay" type="enum" :jv="{1: '锁定[#ff0000]', 0: '正常[#005500]'}">
+<!--					<sa-td width="130" name="车辆状态" prop="pay" type="enum" :jv="{0: '锁定[#ff0000]', 1: '正常[#005500]'}">-->
 					</sa-td>
 					<sa-td name="联系人" prop="driverName"></sa-td>
 					<sa-td name="联系号码" prop="driverPhone"></sa-td>

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclare.java

@@ -37,131 +37,131 @@ public class TbDeclare implements Serializable {
 	/**
 	 * 主键 
 	 */
-	public String id;
+    private String id;
 
 	/**
 	 * 业务id 
 	 */
-	public String businessId;
+    private String businessId;
 
-	public String declarePeople;
+    private String declarePeople;
 
-	public String declarePhone;
+    private String declarePhone;
 
 	/**
 	 * 产品学名 
 	 */
-	public String goodsName;	
+    private String goodsName;
 
 	/**
 	 * 毛重 
 	 */
-	public Double grossWeight;	
+    private Double grossWeight;
 
 	/**
 	 * 件数 
 	 */
-	public Integer num;	
+    private Integer num;
 
 	/**
 	 * 生产日期 
 	 */
-	public String productionDate;	
+    private String productionDate;
 
 	/**
 	 * 保质期 
 	 */
-	public int expirationDate;
+    private Integer expirationDate;
 
 	/**
 	 * 储存条件 
 	 */
-	public String storageMode;	
+    private String storageMode;
 
 	/**
 	 * 生产方式 
 	 */
-	public String productionMode;	
+    private String productionMode;
 
 	/**
 	 * 原产国 
 	 */
-	public String origin;	
+    private String origin;
 
 	/**
 	 * 进口冷链食品生产商注册号 
 	 */
-	public String producerCode;	
+    private String producerCode;
 
 	/**
 	 * 货主单位 
 	 */
-	public String sendUnit;	
+    private String sendUnit;
 
 	/**
 	 * 收货单位 
 	 */
-	public String receiveUnit;	
+    private String receiveUnit;
 
 	/**
 	 * 货物流向 
 	 */
-	public String route;	
+    private String route;
 
 	/**
 	 * 司机姓名 
 	 */
-	public String driverName;	
+    private String driverName;
 
 	/**
 	 * 联系电话(司机) 
 	 */
-	public String driverPhone;	
+    private String driverPhone;
 
 	/**
 	 * 代理商 
 	 */
-	public String agent;	
+    private String agent;
 
 	/**
 	 * 联系电话(代理人) 
 	 */
-	public String agentPhone;	
+    private String agentPhone;
 
 	/**
 	 * 运输车车牌 
 	 */
-	public String chinaCarNo;	
+    private String chinaCarNo;
 
 	/**
 	 * 越南车车牌 
 	 */
-	public String carNo;	
+    private String carNo;
 
 	/**
 	 * 海关报关单据 
 	 */
-	public String customProof;	
+    private String customProof;
 
 	/**
 	 * 进口检验检疫证书 
 	 */
-	public String quarantineProof;	
+    private String quarantineProof;
 
 	/**
 	 * 商铺(互助组) 
 	 */
-	public String shop;	
+    private String shop;
 
 	/**
 	 * 生产批号 
 	 */
-	public String productionCode;	
+    private String productionCode;
 
 	/**
 	 * 柜号 
 	 */
-	public String containerCode;
+    private String containerCode;
 
 	private Date createTime;