From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
index 01c9d48..7a3638a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
@@ -80,7 +80,7 @@
 	@Column(name = "fa_order")
 	private Integer order;
 	
-	// 閫傜敤绫诲瀷 1鏂颁汉
+	// 閫傜敤绫诲瀷 锛� 0閫氱敤  1鏂颁汉
 	@Column(name = "fa_type")
 	private Integer type;
 

--
Gitblit v1.8.0