Merge branch 'develop' into platform_recruit

ruoyi-system/src/main/resources/static/js/activiti.js

@@ -2559,3 +2559,18 @@ function jointPostInfoCzy(postType,leadershipPos,additionalType){
     }
     return postType;
 }
+
+
+/**
+ * 人员修改页面的备注
+ * 从当前页面传递参数到人员备注页面
+ * @returns {{jianyuan: ([[]]|string|*), createTime: (Document.createTime|*)}}
+ */
+function toChildData(){
+    var dataObj={
+        "jianyuan":jianyuan,
+        "createTime":personnel.createTime
+    }
+
+    return dataObj;
+}

ruoyi-system/src/main/resources/templates/process/declaration/add.html

@@ -2762,8 +2762,6 @@
             url = prefix + "/editAll";
         }
 
-        // console.log(JSON.stringify(row));
-
         $.ajax({
             url: url,
             type: "post",

ruoyi-system/src/main/resources/templates/process/declaration/declare/dwdd.html

@@ -252,7 +252,6 @@
     var manyRows=[];
 
     $(function () {
-        console.log("sssss");
         goTopShowAndHide();
         $('#toolBackTop1',parent.parent.document).mousedown(function (e){
             var div_x = e.clientX - $('#moveDiv',parent.parent.document).offset().left;