# version merge

vincentlu

8 天以前 583b31d46bb8abbee7410d29ca229120ee589cba

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java

@@ -11,6 +11,7 @@
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.impl.AgvModelServiceImpl;
import com.zy.acs.manager.system.controller.BaseController;
@@ -71,11 +72,14 @@
                    .eq(AgvModel::getType, agvModel.getType())) > 0) {
                return R.error("this model type has already exist !");
            }
        }        agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        }
        Date now = new Date();
        agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        agvModel.setStatus(StatusType.ENABLE.val);
        agvModel.setCreateBy(getLoginUserId());
        agvModel.setCreateTime(new Date());
        agvModel.setCreateTime(now);
        agvModel.setUpdateBy(getLoginUserId());
        agvModel.setUpdateTime(new Date());
        agvModel.setUpdateTime(now);
        if (!agvModelService.save(agvModel)) {
            return R.error("Save Fail");
        }