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

platform-dao/src/main/java/com/platform/dao/dto/firm/FirmProducerDTO.java

@@ -107,9 +107,4 @@ public class FirmProducerDTO extends BaseDTO implements Serializable {
      */
     private LocalDateTime updateTimeEnd;
 
-    /**
-     * 大类类型 1 生产厂商 2 建筑物
-     */
-    private Integer parentType;
-
 }

platform-dao/src/main/java/com/platform/dao/vo/query/firm/FirmProducerVO.java

@@ -98,10 +98,4 @@ public class FirmProducerVO extends BaseVO implements Serializable {
      */
     private LocalDateTime updateTime;
 
-    /**
-     * 大类类型 1 生产厂商 2 建筑物
-     */
-    private Integer parentType;
-
-
 }

platform-dao/src/main/resources/mapper/firm/FirmProducerMapper.xml

@@ -41,9 +41,6 @@
         <if test="type != null">
             and producer.type = #{type}
         </if>
-        <if test="parentType != null">
-            and producer.parent_type = #{parentType}
-        </if>
         <if test="no != null and no != ''">
             and producer.no = #{no}
         </if>