Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

 package com.zehong.web.controller.complainDeal;
 
+import java.util.Date;
 import java.util.List;
 
 import com.zehong.common.core.domain.model.LoginUser;
@@ -98,6 +99,9 @@ public class TComplainDealController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal)
     {
+        if(tComplainDeal.getComplainStatus().equals("2")){
+            tComplainDeal.setDealTime(new Date());
+        }
         return toAjax(tComplainDealService.updateTComplainDeal(tComplainDeal));
     }