bug修复整合完成

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/TestController.java

@@ -74,7 +74,7 @@ public class TestController {
         waterAj.setStreet("闵行街道");
         waterAj.setAddress("所属街道");
         waterAj.setGrid("网格通道");
-        waterAj.setDescribe("这个就是描述了");
+        waterAj.setAjDescribe("这个就是描述了");
         waterAj.setDutyGroup("上海永天");
         waterAj.setAjFlag(0);
         waterAj.setEndTime(new Date());

mhfire-mapping/src/main/resources/mapper/mysql/WaterAjMapper.xml

@@ -10,7 +10,7 @@
         <result column="street" property="street" />
         <result column="address" property="address" />
         <result column="grid" property="grid" />
-        <result column="describe" property="describe" />
+        <result column="aj_describe" property="ajDescribe" />
         <result column="duty_group" property="dutyGroup" />
         <result column="aj_flag" property="ajFlag" />
         <result column="end_time" property="endTime" />

mhfire-model/src/main/java/com/bizmatics/mhfire/model/WaterAj.java

@@ -56,7 +56,7 @@ public class WaterAj implements Serializable {
     /**
      * 案件描述
      */
-    private String describe;
+    private String ajDescribe;
 
     /**
      * 责任部门
@@ -74,12 +74,12 @@ public class WaterAj implements Serializable {
     private Date endTime;
 
     /**
-     * 附件
+     * 附件(非必要)
      */
     private String enclosure;
 
     /**
-     * 图片
+     * 图片(非必要)
      */
     private String image;