Merge remote-tracking branch 'origin/master'

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1397,7 +1397,7 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.POST)
+    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.GET)
     public Object getSubNode(@PathVariable Integer nys,
                              @RequestParam Integer page,
                              @RequestParam Integer limit,
@@ -1405,7 +1405,6 @@ public class StaBudgetapprovalController extends BaseController {
     ) {
         Integer count = prjAnnualbudgetdetailService.getSubNodeCount(nys, page, limit);
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit, mc);
-
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("code", 0);
         resultMap.put("msg", "");

src/main/java/com/liang/entity/StaActualexpenses.java

@@ -25,6 +25,17 @@ public class StaActualexpenses implements Serializable {
      * 出差人
      */
     private Integer ccr;
+
+    private String ccsy;
+
+    public String getCcsy() {
+        return ccsy;
+    }
+
+    public void setCcsy(String ccsy) {
+        this.ccsy = ccsy;
+    }
+
     private String ccrxm;
     /**
      * 出差地点