diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
index a8ce35e..3fa9fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
@@ -3,15 +3,12 @@
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
-import com.casic.missiles.modular.util.DateUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.text.ParseException;
 import java.util.List;
 
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -55,6 +52,7 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("1");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain + num);
         garbageBags.setUseType(useType);
         garbageBags.setRecyclable(recycable);
@@ -68,7 +66,7 @@
      */
     @RequestMapping(value = "/outbound")
     @ResponseBody
-    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) throws ParseException {
+    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) {
         num = num == null ? 0 : num;
         int remain = garbageBagsService.getRemain();
         if (remain < num) {
@@ -77,14 +75,12 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("2");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain - num);
         garbageBags.setUseType(useType);
         garbageBags.setUseArea(useArea);
         garbageBags.setRecyclable(recycable);
-
-        if (StringUtils.isNotEmpty(useTime)) {
-            garbageBags.setUseTime(DateUtils.sdf4.parse(useTime));
-        }
+        garbageBags.setUseTime(useTime);
         garbageBagsService.insert(garbageBags);
 
         return ResponseData.success();

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
index a8ce35e..3fa9fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
@@ -3,15 +3,12 @@
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
-import com.casic.missiles.modular.util.DateUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.text.ParseException;
 import java.util.List;
 
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -55,6 +52,7 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("1");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain + num);
         garbageBags.setUseType(useType);
         garbageBags.setRecyclable(recycable);
@@ -68,7 +66,7 @@
      */
     @RequestMapping(value = "/outbound")
     @ResponseBody
-    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) throws ParseException {
+    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) {
         num = num == null ? 0 : num;
         int remain = garbageBagsService.getRemain();
         if (remain < num) {
@@ -77,14 +75,12 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("2");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain - num);
         garbageBags.setUseType(useType);
         garbageBags.setUseArea(useArea);
         garbageBags.setRecyclable(recycable);
-
-        if (StringUtils.isNotEmpty(useTime)) {
-            garbageBags.setUseTime(DateUtils.sdf4.parse(useTime));
-        }
+        garbageBags.setUseTime(useTime);
         garbageBagsService.insert(garbageBags);
 
         return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
index 5f96c96..7b7042f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
@@ -36,15 +36,18 @@
      */
     private String type;
     /**
+     * 数量
+     */
+    private Integer num;
+    /**
      * 当前库存
      */
     private Integer remain;
     /**
      * 使用时间
      */
-    @JSONField(serializeUsing = DateDeserializer.class)
     @TableField("use_time")
-    private Date useTime;
+    private String useTime;
     /**
      * 使用类型
      */

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
index a8ce35e..3fa9fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
@@ -3,15 +3,12 @@
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
-import com.casic.missiles.modular.util.DateUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.text.ParseException;
 import java.util.List;
 
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -55,6 +52,7 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("1");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain + num);
         garbageBags.setUseType(useType);
         garbageBags.setRecyclable(recycable);
@@ -68,7 +66,7 @@
      */
     @RequestMapping(value = "/outbound")
     @ResponseBody
-    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) throws ParseException {
+    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) {
         num = num == null ? 0 : num;
         int remain = garbageBagsService.getRemain();
         if (remain < num) {
@@ -77,14 +75,12 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("2");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain - num);
         garbageBags.setUseType(useType);
         garbageBags.setUseArea(useArea);
         garbageBags.setRecyclable(recycable);
-
-        if (StringUtils.isNotEmpty(useTime)) {
-            garbageBags.setUseTime(DateUtils.sdf4.parse(useTime));
-        }
+        garbageBags.setUseTime(useTime);
         garbageBagsService.insert(garbageBags);
 
         return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
index 5f96c96..7b7042f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
@@ -36,15 +36,18 @@
      */
     private String type;
     /**
+     * 数量
+     */
+    private Integer num;
+    /**
      * 当前库存
      */
     private Integer remain;
     /**
      * 使用时间
      */
-    @JSONField(serializeUsing = DateDeserializer.class)
     @TableField("use_time")
-    private Date useTime;
+    private String useTime;
     /**
      * 使用类型
      */
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java
deleted file mode 100644
index 7c38eba..0000000
--- a/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.modular.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2015/2/25.
- */
-public class DateUtils {
-    public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd");
-    public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss");
-    public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    public static final SimpleDateFormat sdf5 = new SimpleDateFormat("HH:mm:ss");
-
-
-    /**
-     * 获取当年的第一天
-     *
-     * @return
-     */
-    public static Date getCurrYearFirst() {
-        Calendar currCal = Calendar.getInstance();
-        int currentYear = currCal.get(Calendar.YEAR);
-        return getYearFirst(currentYear);
-    }
-
-
-    /**
-     * 获取某年第一天日期
-     *
-     * @param year 年份
-     * @return Date
-     */
-    public static Date getYearFirst(int year) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.clear();
-        calendar.set(Calendar.YEAR, year);
-        Date currYearFirst = calendar.getTime();
-        return currYearFirst;
-    }
-}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
index a8ce35e..3fa9fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/GarbageBagsController.java
@@ -3,15 +3,12 @@
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
-import com.casic.missiles.modular.util.DateUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.text.ParseException;
 import java.util.List;
 
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -55,6 +52,7 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("1");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain + num);
         garbageBags.setUseType(useType);
         garbageBags.setRecyclable(recycable);
@@ -68,7 +66,7 @@
      */
     @RequestMapping(value = "/outbound")
     @ResponseBody
-    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) throws ParseException {
+    public Object delete(Integer num, String useType, String useTime, String useArea, String recycable) {
         num = num == null ? 0 : num;
         int remain = garbageBagsService.getRemain();
         if (remain < num) {
@@ -77,14 +75,12 @@
 
         GarbageBags garbageBags = new GarbageBags();
         garbageBags.setType("2");
+        garbageBags.setNum(num);
         garbageBags.setRemain(remain - num);
         garbageBags.setUseType(useType);
         garbageBags.setUseArea(useArea);
         garbageBags.setRecyclable(recycable);
-
-        if (StringUtils.isNotEmpty(useTime)) {
-            garbageBags.setUseTime(DateUtils.sdf4.parse(useTime));
-        }
+        garbageBags.setUseTime(useTime);
         garbageBagsService.insert(garbageBags);
 
         return ResponseData.success();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
index 5f96c96..7b7042f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/GarbageBags.java
@@ -36,15 +36,18 @@
      */
     private String type;
     /**
+     * 数量
+     */
+    private Integer num;
+    /**
      * 当前库存
      */
     private Integer remain;
     /**
      * 使用时间
      */
-    @JSONField(serializeUsing = DateDeserializer.class)
     @TableField("use_time")
-    private Date useTime;
+    private String useTime;
     /**
      * 使用类型
      */
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java
deleted file mode 100644
index 7c38eba..0000000
--- a/casic-server/src/main/java/com/casic/missiles/modular/util/DateUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.modular.util;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2015/2/25.
- */
-public class DateUtils {
-    public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd");
-    public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss");
-    public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    public static final SimpleDateFormat sdf5 = new SimpleDateFormat("HH:mm:ss");
-
-
-    /**
-     * 获取当年的第一天
-     *
-     * @return
-     */
-    public static Date getCurrYearFirst() {
-        Calendar currCal = Calendar.getInstance();
-        int currentYear = currCal.get(Calendar.YEAR);
-        return getYearFirst(currentYear);
-    }
-
-
-    /**
-     * 获取某年第一天日期
-     *
-     * @param year 年份
-     * @return Date
-     */
-    public static Date getYearFirst(int year) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.clear();
-        calendar.set(Calendar.YEAR, year);
-        Date currYearFirst = calendar.getTime();
-        return currYearFirst;
-    }
-}
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 720d7a8..9fa7334 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11307
+  port: 8083
 ###################  spring配置  ###################
 spring:
  datasource: