添加宜宾线上pom配置

fill-manager/src/main/java/com/mortals/xhx/module/app/dao/ibatis/AppConfigDaoImpl.java

 package com.mortals.xhx.module.app.dao.ibatis;
 
 
-<<<<<<< HEAD
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.module.app.dao.AppConfigDao;
 import com.mortals.xhx.module.app.model.AppConfigEntity;
 import org.springframework.stereotype.Repository;
 
-=======
-import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.app.dao.AppConfigDao;
-import com.mortals.xhx.module.app.model.AppConfigEntity;
-import java.util.Date;
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
->>>>>>> first
 /**
 * 应用列DaoImpl DAO接口
 *

fill-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppConfigVo.java

 package com.mortals.xhx.module.app.model.vo;
-<<<<<<< HEAD
 
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
 
 import java.util.List;
 
-=======
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.app.model.AppConfigEntity;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Data;
-import com.mortals.framework.annotation.Excel;
-import java.math.BigDecimal;
-import java.util.Date;
->>>>>>> first
+
 /**
 * 应用列视图对象
 *

fill-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumInfoFieldController.java

@@ -2,35 +2,10 @@ package com.mortals.xhx.module.datum.web;
 
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.module.datum.model.DatumInfoFieldQuery;
-import com.mortals.xhx.module.device.model.DeviceEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumPrintQuery;
-import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
-import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.DataTypeEnum;
-import com.mortals.xhx.common.code.FieldTypeEnum;
-import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
 import com.mortals.xhx.module.datum.model.DatumInfoFieldQuery;
 import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
@@ -47,18 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Arrays;
-
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import static com.mortals.framework.ap.SysConstains.*;
-
-import com.mortals.xhx.common.code.*;
 
 /**
  * 填单用户信息字段
@@ -108,11 +71,7 @@ public class DatumInfoFieldController extends BaseCRUDJsonBodyMappingController<
                 if (!ObjectUtils.isEmpty(datumPrintEntity.getFormContent())) {
                     Rest<List<DatumInfoFieldEntity>> rest = this.service.parseFormContent(datumPrintEntity, context);
                     if (rest.getCode() == YesNoEnum.YES.getValue() && !ObjectUtils.isEmpty(rest.getData())) {
-<<<<<<< HEAD
-                        this.service.save(rest.getData(),getContext());
-=======
-                        this.service.save(rest.getData());
->>>>>>> first
+                        this.service.save(rest.getData(), getContext());
                     }
                 }
             }