Merge branch 'dev' of http://172.16.90.250:3000/cqcarbon/carbon-platform into dev

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductTypePriceForm.java

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,10 +15,13 @@ public class ProductTypePriceForm extends BaseForm {
 
     private String remark;
 
+    @ApiModelProperty(value = "审核状态 0：待审核  1：审核通过  2：审核未通过")
     private Integer checkState;
 
-    private Date checkTime;
+    @ApiModelProperty(value = "审核通过时间")
+    private String checkTime;
 
+    @ApiModelProperty(value = "审核备注")
     private String checkRemark;
 
     private Integer state;
@@ -30,7 +34,9 @@ public class ProductTypePriceForm extends BaseForm {
 
     private Date modifiedTime;
 
+    @ApiModelProperty(value = "类别id")
     private String fkProductType;
 
+    @ApiModelProperty(value = "类别名称")
     private String typeName;
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/ProductTypePriceController.java

@@ -16,7 +16,7 @@ import javax.validation.Valid;
 
 @RestController
 @RequestMapping("/web/price")
-@Api(description = "定价管理")
+@Api(description = "定价管理",tags = "定价管理")
 public class ProductTypePriceController extends BaseController {
 
     @Autowired

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CustomerCompanyTypeServiceImpl.java

@@ -105,7 +105,7 @@ public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeServic
 
     @Override
     public PageInfo<List<CustomerCompanyType>> selectList(CustomerCompanyTypeForm customerCompanyTypeForm) {
-        PageHelper.startPage(customerCompanyTypeForm.getPageNum(),customerCompanyTypeForm.getPageSize());
+        PageHelper.startPage(customerCompanyTypeForm.getPageNo(),customerCompanyTypeForm.getPageSize());
         List<CustomerCompanyType> list = customerCompanyTypeMapper.selectList(customerCompanyTypeForm);
         return new PageInfo(list);
     }

carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypePriceMapper.xml

@@ -212,7 +212,7 @@
     SELECT <include refid="Base_Column_List"/>,<include refid="Blob_Column_List"/> FROM t_product_type_price
       WHERE state = 1
     <if test="typeName != null and typeName !=''">
-      AND type_name LIKE CONCAT("%",#{typeName,jdbcType=LONGVARCHAR},"%)"
+      AND type_name LIKE CONCAT("%",#{typeName,jdbcType=LONGVARCHAR},"%")
     </if>
     <if test="fkProductType != null and fkProductType !=''">
       AND FIND_IN_SET(#{fkProductType},fk_product_type)