Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -50,6 +50,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -92,7 +92,7 @@ public class IoOrderDetailBizEntity {
     /**
      * 价格
      */
-    @TableField(value = "price")
+    @TableField(value = "price",fill = FieldFill.UPDATE)
     private BigDecimal price;
 
     /**

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -112,5 +112,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private Integer corpType;
     private Integer sortNum;
 
+    private Integer actionType;
+
 
 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -33,6 +33,9 @@
             <if test="secCheckEnable != null">
                 AND bu.secCheckEnable = #{secCheckEnable}
             </if>
+            <if test="actionType != null">
+                AND bu.actionType = #{actionType}
+            </if>
             <if test="busType != null">
                 AND bu.busType = #{busType}
             </if>