Commit 34234886202596a20c7c67631e263aaa7f695e76

Authored by lichao
2 parents a52e341f 3368b869

Merge remote-tracking branch 'origin/dev' into dev

trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
@@ -170,6 +170,7 @@ public class GarOrderMatchAsk implements Serializable { @@ -170,6 +170,7 @@ public class GarOrderMatchAsk implements Serializable {
170 /** 170 /**
171 * 投放点 编号 171 * 投放点 编号
172 */ 172 */
  173 + @TableField(exist = false)
173 private String dropPointNo; 174 private String dropPointNo;
174 175
175 176
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
@@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
19 <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/> 19 <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
20 <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/> 20 <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
21 <result property="dropPointNo" column="drop_point_no" jdbcType="VARCHAR"/> 21 <result property="dropPointNo" column="drop_point_no" jdbcType="VARCHAR"/>
22 -  
23 -  
24 </resultMap> 22 </resultMap>
25 23
26 <sql id="Base_Column_List"> 24 <sql id="Base_Column_List">