Merge remote-tracking branch 'Gogs/develop' into develop

src/rest/openapi/restcontroller/housekeeper/titem/AgentTitem.java

@@ -91,14 +91,14 @@ public class AgentTitem extends Controller {
                     addtitem.setValue("FITEMNO",where.getString("fitemno"),11l);
                     addtitem.setValue("fitemname",where.getString("fitemname"),11l);
                     addtitem.setValue("fisused",where.getBoolean("fisused"),11l);
-                    if(where.containsKey("fmodel")&&StringUtils.isBlank("fmodel")){
-                        addtitem.setValue("fmodel",where.getBoolean("fmodel"),11l);
+                    if(where.containsKey("fmodel")&&!StringUtils.isBlank("fmodel")){
+                        addtitem.setValue("fmodel",where.getString("fmodel"),11l);
                     }
-                    if(where.containsKey("fspec")&&StringUtils.isBlank("fspec")){
-                        addtitem.setValue("fspec",where.getBoolean("fspec"),11l);
+                    if(where.containsKey("fspec")&&!StringUtils.isBlank("fspec")){
+                        addtitem.setValue("fspec",where.getString("fspec"),11l);
                     }
-                    if(where.containsKey("fnotes")&&StringUtils.isBlank("fnotes")){
-                        addtitem.setValue("fnotes",where.getBoolean("fnotes"),11l);
+                    if(where.containsKey("fnotes")&&!StringUtils.isBlank("fnotes")){
+                        addtitem.setValue("fnotes",where.getString("fnotes"),11l);
                     }
                     long uniqueIDValue = addtitem.getUniqueIDValue();
                     tagents_titem.save();

src/rest/openapi/restcontroller/housekeeper/titem/HeadTitem.java

@@ -134,7 +134,7 @@ public class HeadTitem extends Controller {
         }
         return getReturnObject_err("缺少where参数").toString();
     }
-    /**批量删除本站物料**/
+    /**批量删除本站物料**///
     public String detetitems(){
         if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
         if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();