Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

src/main/java/com/steerinfo/dil/service/impl/WmspGridMaterialServiceImpl.java

@@ -274,8 +274,10 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         BigDecimal checkId = wmspCheckWarehouseMapper.getMaxId();
         if (checkId==null){
             checkId=new BigDecimal(1);
+        }else{
+            checkId.add(new BigDecimal(1));
         }
-        wmspCheckWarehouse.setCheckId(checkId.add(new BigDecimal(1)));
+        wmspCheckWarehouse.setCheckId(checkId);
         int result = wmspCheckWarehouseMapper.insertSelective(wmspCheckWarehouse);
 
         return result;

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8