Merge remote-tracking branch 'origin/master'

cyx-admin/pom.xml

@@ -67,6 +67,12 @@
             <artifactId>cyx-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shotName != null  and shotName != ''"> and a.shot_name = #{shotName}</if>
             <if test="unit != null  and unit != ''"> and a.unit = #{unit}</if>
             <if test="target != null  and target != ''"> and a.target = #{target}</if>
+            <if test="zhiwu != null  and zhiwu != ''"> and b.party_duties = #{zhiwu}</if>
 <!--            <if test="target != null  and target != ''">-->
 <!--                AND a.target like concat('%', #{target}, '%')-->
 <!--            </if>-->