From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java
index 9ce02e0..6b12a55 100644
--- a/java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java
@@ -29,14 +29,13 @@
     public int saveOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     @RequestMapping(value = "/updateOaWorkflowForm", method = RequestMethod.POST)
-    public int updateOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+    public int updateOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     @RequestMapping(value = "/deleteOaWorkflowForm", method = RequestMethod.POST)
-    public int deleteOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+    public int deleteOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     /**
      * <p>鏌ヨ灏忓尯妤间俊鎭�</p>
-     *
      *
      * @param oaWorkflowFormDto 鏁版嵁瀵硅薄鍒嗕韩
      * @return OaWorkflowFormDto 瀵硅薄鏁版嵁
@@ -54,7 +53,7 @@
     int queryOaWorkflowFormsCount(@RequestBody OaWorkflowFormDto oaWorkflowFormDto);
 
     /**
-     *  鏄惁鏈夎〃
+     * 鏄惁鏈夎〃
      *
      * @param table 鏁版嵁瀵硅薄鍒嗕韩
      * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
@@ -67,6 +66,7 @@
 
     /**
      * 鏌ヨ鏁版嵁鎬昏褰曟暟
+     *
      * @param oaWorkflowFormDto
      * @return
      */
@@ -78,8 +78,25 @@
 
     /**
      * 淇濆瓨琛ㄥ崟鏁版嵁
+     *
      * @param reqJson
      */
     @RequestMapping(value = "/saveOaWorkflowFormData", method = RequestMethod.POST)
     int saveOaWorkflowFormData(@RequestBody JSONObject reqJson);
+
+    /**
+     * 淇敼琛ㄥ崟鏁版嵁
+     *
+     * @param reqJson
+     */
+    @RequestMapping(value = "/updateOaWorkflowFormData", method = RequestMethod.POST)
+    int updateOaWorkflowFormData(@RequestBody JSONObject reqJson);
+
+    /**
+     * 淇敼琛ㄥ崟鏁版嵁
+     *
+     * @param reqJson
+     */
+    @RequestMapping(value = "/updateOaWorkflowFormDataAll", method = RequestMethod.POST)
+    int updateOaWorkflowFormDataAll(@RequestBody JSONObject reqJson);
 }

--
Gitblit v1.8.0