Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/bean/request/ProjectRequest.java

@@ -3,6 +3,7 @@ package com.zjugis.business.bean.request;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 
 /**
  * @author ljy
@@ -73,4 +74,7 @@ public class ProjectRequest {
      * 责任部门ID
      */
     private String zrbmId;
+
+
+    private BigDecimal shareRatio;
 }

zjugis-business/src/main/java/com/zjugis/business/controller/CommonController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author ljy