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

lichao
2 parents a52e341f 3368b869
Showing 2 changed files with 1 additions and 2 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
@@ -170,6 +170,7 @@ public class GarOrderMatchAsk implements Serializable {
     /**
      * 投放点 编号
      */
+    @TableField(exist = false)
     private String dropPointNo;
  
  
@@ -19,8 +19,6 @@
             <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
             <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
             <result property="dropPointNo" column="drop_point_no" jdbcType="VARCHAR"/>
-            
-            
     </resultMap>
  
     <sql id="Base_Column_List">