整合2

e60ef349 · 赵剑炜 · c84d6cf3 · e60ef349 · e60ef349 · e60ef349
Commit e60ef349 authored May 22, 2023 by 赵剑炜
--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductBatchDto.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductBatchDto.java
-package com.junmp.gold.api.bean.dto;
+package com.junmp.jyzb.api.bean.dto;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductProcessDto.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductProcessDto.java
-package com.junmp.gold.api.bean.dto;
+package com.junmp.jyzb.api.bean.dto;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductTagDto.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductTagDto.java
-package com.junmp.gold.api.bean.dto;
+package com.junmp.jyzb.api.bean.dto;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SimpleTagDto.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SimpleTagDto.java
-package com.junmp.gold.api.bean.dto;
+package com.junmp.jyzb.api.bean.dto;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CompanyReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CompanyReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

 import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DbAccessReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DbAccessReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductBatchReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductBatchReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

 import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

 import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductSkuReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductSkuReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductTagReq.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductTagReq.java
-package com.junmp.gold.api.bean.req;
+package com.junmp.jyzb.api.bean.req;

-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.junmp.v2.common.bean.request.BaseRequest;
-import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

 import javax.validation.constraints.NotNull;
-import java.util.Date;

 /**
 * <pre>

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/AuthAccessVo.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/AuthAccessVo.java
-package com.junmp.gold.api.bean.vo;
+package com.junmp.jyzb.api.bean.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/NDefContentVo.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/NDefContentVo.java
-package com.junmp.gold.api.bean.vo;
+package com.junmp.jyzb.api.bean.vo;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/ProductSkuVo.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/ProductSkuVo.java
-package com.junmp.gold.api.bean.vo;
+package com.junmp.jyzb.api.bean.vo;

 import lombok.Data;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/TagInfoVo.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/TagInfoVo.java
-package com.junmp.gold.api.bean.vo;
+package com.junmp.jyzb.api.bean.vo;

 import lombok.Builder;
 import lombok.Data;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java
-package com.junmp.gold.api.constant;
+package com.junmp.jyzb.api.constant;

 /**
 * <pre>

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/JYZBAppException.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/JYZBAppException.java
-package com.junmp.gold.api.exception;
+package com.junmp.jyzb.api.exception;

 import cn.hutool.core.util.StrUtil;
-import com.junmp.gold.api.constant.JYZBConstant;
+import com.junmp.jyzb.api.constant.JYZBConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;
 import com.junmp.v2.common.exception.base.ServiceException;


--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CompanyExceptionEnum.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CompanyExceptionEnum.java
-package com.junmp.gold.api.exception.enums;
+package com.junmp.jyzb.api.exception.enums;

-import com.junmp.gold.api.constant.JYZBConstant;
+import com.junmp.jyzb.api.constant.JYZBConstant;
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;
 import lombok.Getter;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProductExceptionEnum.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProductExceptionEnum.java
-package com.junmp.gold.api.exception.enums;
+package com.junmp.jyzb.api.exception.enums;

-import com.junmp.gold.api.constant.JYZBConstant;
+import com.junmp.jyzb.api.constant.JYZBConstant;
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;
 import lombok.Getter;

--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/package-info.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/package-info.java
@@ -10,4 +10,4 @@
 *
 * </pre>
 */
-package com.junmp.gold.api.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
--- a/jyzb-api/src/main/java/com/junmp/jyzb/api/util/GenCodeUtil.java
+++ b/jyzb-api/src/main/java/com/junmp/jyzb/api/util/GenCodeUtil.java
-package com.junmp.gold.api.util;
+package com.junmp.jyzb.api.util;

 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;

--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductBatchDto.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductBatchDto.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductProcessDto.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductProcessDto.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductTagDto.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/ProductTagDto.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/SimpleTagDto.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/dto/SimpleTagDto.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/CompanyReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/CompanyReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/DbAccessReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/DbAccessReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductBatchReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductBatchReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductSkuReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductSkuReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductTagReq.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/req/ProductTagReq.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/AuthAccessVo.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/AuthAccessVo.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/NDefContentVo.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/NDefContentVo.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/ProductSkuVo.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/ProductSkuVo.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/TagInfoVo$TagInfoVoBuilder.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/TagInfoVo$TagInfoVoBuilder.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/TagInfoVo.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/bean/vo/TagInfoVo.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/constant/GoldConstant.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/constant/GoldConstant.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/exception/GoldAppException.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/exception/GoldAppException.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/exception/enums/CompanyExceptionEnum.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/exception/enums/CompanyExceptionEnum.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/exception/enums/ProductExceptionEnum.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/exception/enums/ProductExceptionEnum.class
--- a/jyzb-api/target/classes/com/junmp/gold/api/util/GenCodeUtil.class
+++ b/jyzb-api/target/classes/com/junmp/gold/api/util/GenCodeUtil.class
--- a/jyzb-api/target/jyzb-app.jar
+++ b/jyzb-api/target/jyzb-app.jar
--- a/jyzb-biz/src/main/java/com/junmp/jyzb/cache/GoldRedisCache.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/cache/GoldRedisCache.java
-package com.junmp.gold.cache;
+package com.junmp.jyzb.cache;

-import com.junmp.gold.api.constant.JYZBConstant;
+import com.junmp.jyzb.api.constant.JYZBConstant;
 import com.junmp.v2.cache.AbstractRedisCache;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CompanyController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CompanyController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

 import cn.hutool.core.util.StrUtil;
-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.doc.CompanyDoc;
-import com.junmp.gold.entity.Company;
-import com.junmp.gold.service.CompanyService;
+import com.junmp.jyzb.api.bean.req.CompanyReq;
+import com.junmp.jyzb.doc.CompanyDoc;
+import com.junmp.jyzb.entity.Company;
+import com.junmp.jyzb.service.CompanyService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/LoginController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/LoginController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;


 import cn.hutool.core.util.StrUtil;
-import com.junmp.gold.api.constant.JYZBConstant;
-import com.junmp.gold.cache.GoldRedisCache;
-import com.junmp.gold.doc.LoginDoc;
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.jyzb.cache.GoldRedisCache;
+import com.junmp.jyzb.doc.LoginDoc;
 import com.junmp.v2.auth.api.bean.auth.LoginReq;
 import com.junmp.v2.auth.api.bean.auth.LoginRes;
 import com.junmp.v2.auth.sign.AuthContainer;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductBatchController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductBatchController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.junmp.gold.api.bean.dto.ProductBatchDto;
-import com.junmp.gold.api.bean.dto.ProductProcessDto;
-import com.junmp.gold.api.bean.req.ProductBatchReq;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
-import com.junmp.gold.api.util.GenCodeUtil;
-import com.junmp.gold.doc.ProductBatchDoc;
-import com.junmp.gold.entity.ProductBatch;
-import com.junmp.gold.entity.ProductTag;
-import com.junmp.gold.service.ProductBatchService;
-import com.junmp.gold.service.ProductTagService;
+import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
+import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
+import com.junmp.jyzb.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.doc.ProductBatchDoc;
+import com.junmp.jyzb.entity.ProductBatch;
+import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.service.ProductBatchService;
+import com.junmp.jyzb.service.ProductTagService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

-import com.junmp.gold.api.bean.req.ProductReq;
-import com.junmp.gold.doc.ProductDoc;
-import com.junmp.gold.entity.Product;
-import com.junmp.gold.service.ProductService;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.doc.ProductDoc;
+import com.junmp.jyzb.entity.Product;
+import com.junmp.jyzb.service.ProductService;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import lombok.extern.slf4j.Slf4j;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductSkuController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductSkuController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

 import cn.hutool.core.util.ObjectUtil;
-import com.junmp.gold.api.bean.req.ProductSkuReq;
-import com.junmp.gold.api.bean.vo.ProductSkuVo;
-import com.junmp.gold.doc.ProductSkuDoc;
-import com.junmp.gold.entity.ProductSku;
-import com.junmp.gold.service.ProductSkuService;
+import com.junmp.jyzb.api.bean.req.ProductSkuReq;
+import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
+import com.junmp.jyzb.doc.ProductSkuDoc;
+import com.junmp.jyzb.entity.ProductSku;
+import com.junmp.jyzb.service.ProductSkuService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductTagController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductTagController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.junmp.gold.api.bean.dto.ProductTagDto;
-import com.junmp.gold.api.bean.req.ProductTagReq;
-import com.junmp.gold.api.bean.vo.TagInfoVo;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
-import com.junmp.gold.doc.ProductTagDoc;
-import com.junmp.gold.entity.ProductTag;
-import com.junmp.gold.service.ProductTagService;
+import com.junmp.jyzb.api.bean.dto.ProductTagDto;
+import com.junmp.jyzb.api.bean.req.ProductTagReq;
+import com.junmp.jyzb.api.bean.vo.TagInfoVo;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.doc.ProductTagDoc;
+import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.service.ProductTagService;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
 import com.junmp.v2.db.api.page.PageResult;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
-package com.junmp.gold.controller;
+package com.junmp.jyzb.controller;

 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.AES;
-import com.junmp.gold.api.bean.req.DbAccessReq;
-import com.junmp.gold.api.bean.vo.AuthAccessVo;
+import com.junmp.jyzb.api.bean.req.DbAccessReq;
+import com.junmp.jyzb.api.bean.vo.AuthAccessVo;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
 import lombok.extern.slf4j.Slf4j;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/CompanyDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/CompanyDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.entity.Company;
+import com.junmp.jyzb.api.bean.req.CompanyReq;
+import com.junmp.jyzb.entity.Company;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/LoginDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/LoginDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

 import com.junmp.v2.auth.api.bean.auth.LoginReq;
 import com.junmp.v2.auth.api.bean.auth.LoginRes;
 import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;

 /**
 * <pre>

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductBatchDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductBatchDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

-import com.junmp.gold.api.bean.dto.ProductBatchDto;
-import com.junmp.gold.api.bean.dto.ProductProcessDto;
-import com.junmp.gold.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
+import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
+import com.junmp.jyzb.api.bean.req.ProductBatchReq;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.api.bean.req.ProductReq;
-import com.junmp.gold.entity.Company;
-import com.junmp.gold.entity.Product;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductSkuDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductSkuDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

-import com.junmp.gold.api.bean.req.ProductSkuReq;
-import com.junmp.gold.api.bean.vo.ProductSkuVo;
-import com.junmp.gold.entity.ProductSku;
+import com.junmp.jyzb.api.bean.req.ProductSkuReq;
+import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
+import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductTagDoc.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductTagDoc.java
-package com.junmp.gold.doc;
+package com.junmp.jyzb.doc;

-import com.junmp.gold.api.bean.req.ProductTagReq;
-import com.junmp.gold.api.bean.vo.TagInfoVo;
-import com.junmp.gold.entity.ProductTag;
+import com.junmp.jyzb.api.bean.req.ProductTagReq;
+import com.junmp.jyzb.api.bean.vo.TagInfoVo;
+import com.junmp.jyzb.entity.ProductTag;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;


 /**

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/entity/Company.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/entity/Company.java
-package com.junmp.gold.entity;
+package com.junmp.jyzb.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/entity/Product.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/entity/Product.java
-package com.junmp.gold.entity;
+package com.junmp.jyzb.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductBatch.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductBatch.java
-package com.junmp.gold.entity;
+package com.junmp.jyzb.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductSku.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductSku.java
-package com.junmp.gold.entity;
+package com.junmp.jyzb.entity;

 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductTag.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProductTag.java
-package com.junmp.gold.entity;
+package com.junmp.jyzb.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CompanyMapper.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CompanyMapper.java
-package com.junmp.gold.mapper;
+package com.junmp.jyzb.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.junmp.gold.entity.Company;
+import com.junmp.jyzb.entity.Company;
 import org.apache.ibatis.annotations.Mapper;

 /**

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductBatchMapper.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductBatchMapper.java
-package com.junmp.gold.mapper;
+package com.junmp.jyzb.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.junmp.gold.api.bean.dto.ProductBatchDto;
-import com.junmp.gold.api.bean.dto.ProductProcessDto;
-import com.junmp.gold.api.bean.req.ProductBatchReq;
-import com.junmp.gold.entity.ProductBatch;
+import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
+import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
+import com.junmp.jyzb.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.entity.ProductBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;


--- a/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductMapper.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductMapper.java
-package com.junmp.gold.mapper;
+package com.junmp.jyzb.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.junmp.gold.entity.Product;
+import com.junmp.jyzb.entity.Product;
 import org.apache.ibatis.annotations.Mapper;

 /**

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductSkuMapper.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductSkuMapper.java
-package com.junmp.gold.mapper;
+package com.junmp.jyzb.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.junmp.gold.entity.ProductSku;
+import com.junmp.jyzb.entity.ProductSku;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;


--- a/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductTagMapper.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductTagMapper.java
-package com.junmp.gold.mapper;
+package com.junmp.jyzb.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.junmp.gold.api.bean.dto.ProductTagDto;
-import com.junmp.gold.api.bean.dto.SimpleTagDto;
-import com.junmp.gold.entity.ProductTag;
+import com.junmp.jyzb.api.bean.dto.ProductTagDto;
+import com.junmp.jyzb.api.bean.dto.SimpleTagDto;
+import com.junmp.jyzb.entity.ProductTag;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

-import java.util.List;
-
 /**
 * <pre>
 *

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/CompanyService.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/CompanyService.java
-package com.junmp.gold.service;
+package com.junmp.jyzb.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.entity.Company;
+import com.junmp.jyzb.api.bean.req.CompanyReq;
+import com.junmp.jyzb.entity.Company;
 import com.junmp.v2.db.api.page.PageResult;

 import java.util.List;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductBatchService.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductBatchService.java
-package com.junmp.gold.service;
+package com.junmp.jyzb.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.gold.api.bean.dto.ProductBatchDto;
-import com.junmp.gold.api.bean.dto.ProductProcessDto;
-import com.junmp.gold.api.bean.req.ProductBatchReq;
-import com.junmp.gold.entity.ProductBatch;
+import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
+import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
+import com.junmp.jyzb.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.entity.ProductBatch;
 import com.junmp.v2.db.api.page.PageResult;

 import java.util.List;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductService.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductService.java
-package com.junmp.gold.service;
+package com.junmp.jyzb.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.api.bean.req.ProductReq;
-import com.junmp.gold.entity.Company;
-import com.junmp.gold.entity.Product;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.v2.db.api.page.PageResult;

 import java.util.List;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductSkuService.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductSkuService.java
-package com.junmp.gold.service;
+package com.junmp.jyzb.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.gold.api.bean.req.ProductSkuReq;
-import com.junmp.gold.entity.ProductSku;
+import com.junmp.jyzb.api.bean.req.ProductSkuReq;
+import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.v2.db.api.page.PageResult;

 import java.util.List;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductTagService.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductTagService.java
-package com.junmp.gold.service;
+package com.junmp.jyzb.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.gold.api.bean.dto.ProductTagDto;
-import com.junmp.gold.api.bean.req.ProductTagReq;
-import com.junmp.gold.entity.ProductTag;
+import com.junmp.jyzb.api.bean.dto.ProductTagDto;
+import com.junmp.jyzb.api.bean.req.ProductTagReq;
+import com.junmp.jyzb.entity.ProductTag;
 import com.junmp.v2.db.api.page.PageResult;

 import java.util.List;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CompanyServiceImpl.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CompanyServiceImpl.java
-package com.junmp.gold.service.impl;
+package com.junmp.jyzb.service.impl;


 import cn.hutool.core.util.ObjectUtil;
@@ -6,12 +6,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.api.exception.enums.CompanyExceptionEnum;
-import com.junmp.gold.api.util.GenCodeUtil;
-import com.junmp.gold.entity.Company;
-import com.junmp.gold.mapper.CompanyMapper;
-import com.junmp.gold.service.CompanyService;
+import com.junmp.jyzb.api.bean.req.CompanyReq;
+import com.junmp.jyzb.api.exception.enums.CompanyExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.entity.Company;
+import com.junmp.jyzb.mapper.CompanyMapper;
+import com.junmp.jyzb.service.CompanyService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductBatchServiceImpl.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductBatchServiceImpl.java
-package com.junmp.gold.service.impl;
+package com.junmp.jyzb.service.impl;

 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.gold.api.bean.dto.ProductBatchDto;
-import com.junmp.gold.api.bean.dto.ProductProcessDto;
-import com.junmp.gold.api.bean.req.ProductBatchReq;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
-import com.junmp.gold.api.util.GenCodeUtil;
-import com.junmp.gold.entity.ProductBatch;
-import com.junmp.gold.mapper.ProductBatchMapper;
-import com.junmp.gold.service.ProductBatchService;
+import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
+import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
+import com.junmp.jyzb.api.bean.req.ProductBatchReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.entity.ProductBatch;
+import com.junmp.jyzb.mapper.ProductBatchMapper;
+import com.junmp.jyzb.service.ProductBatchService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
 import com.junmp.v2.common.util.BeanPlusUtil;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java
-package com.junmp.gold.service.impl;
+package com.junmp.jyzb.service.impl;

 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.gold.api.bean.req.CompanyReq;
-import com.junmp.gold.api.bean.req.ProductReq;
-import com.junmp.gold.api.exception.enums.CompanyExceptionEnum;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
-import com.junmp.gold.api.util.GenCodeUtil;
-import com.junmp.gold.entity.Company;
-import com.junmp.gold.entity.Product;
-import com.junmp.gold.mapper.ProductMapper;
-import com.junmp.gold.service.ProductService;
-import com.junmp.gold.service.ProductSkuService;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.entity.Product;
+import com.junmp.jyzb.mapper.ProductMapper;
+import com.junmp.jyzb.service.ProductService;
+import com.junmp.jyzb.service.ProductSkuService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductSkuServiceImpl.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductSkuServiceImpl.java
-package com.junmp.gold.service.impl;
+package com.junmp.jyzb.service.impl;

 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.gold.api.bean.req.ProductSkuReq;
-import com.junmp.gold.api.exception.JYZBAppException;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
-import com.junmp.gold.api.util.GenCodeUtil;
-import com.junmp.gold.entity.Product;
-import com.junmp.gold.entity.ProductSku;
-import com.junmp.gold.mapper.ProductSkuMapper;
-import com.junmp.gold.service.ProductService;
-import com.junmp.gold.service.ProductSkuService;
+import com.junmp.jyzb.api.bean.req.ProductSkuReq;
+import com.junmp.jyzb.api.exception.JYZBAppException;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.entity.Product;
+import com.junmp.jyzb.entity.ProductSku;
+import com.junmp.jyzb.mapper.ProductSkuMapper;
+import com.junmp.jyzb.service.ProductService;
+import com.junmp.jyzb.service.ProductSkuService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;

--- a/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductTagServiceImpl.java
+++ b/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductTagServiceImpl.java
-package com.junmp.gold.service.impl;
+package com.junmp.jyzb.service.impl;


 import cn.hutool.core.collection.CollectionUtil;
@@ -7,15 +7,15 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.gold.api.bean.dto.ProductTagDto;
-import com.junmp.gold.api.bean.dto.SimpleTagDto;
+import com.junmp.jyzb.api.bean.dto.ProductTagDto;
+import com.junmp.jyzb.api.bean.dto.SimpleTagDto;

-import com.junmp.gold.api.bean.req.ProductTagReq;
-import com.junmp.gold.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.bean.req.ProductTagReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;

-import com.junmp.gold.entity.ProductTag;
-import com.junmp.gold.mapper.ProductTagMapper;
-import com.junmp.gold.service.ProductTagService;
+import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.mapper.ProductTagMapper;
+import com.junmp.jyzb.service.ProductTagService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;

--- a/jyzb-biz/src/main/resources/mapper/CompanyMapper.xml
+++ b/jyzb-biz/src/main/resources/mapper/CompanyMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.gold.mapper.CompanyMapper">
+<mapper namespace="com.junmp.jyzb.mapper.CompanyMapper">


    <select id="getMaxSn" resultType="java.lang.Integer">

--- a/jyzb-biz/src/main/resources/mapper/ProductBatchMapper.xml
+++ b/jyzb-biz/src/main/resources/mapper/ProductBatchMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.gold.mapper.ProductBatchMapper">
+<mapper namespace="com.junmp.jyzb.mapper.ProductBatchMapper">


    <select id="getMaxSn" resultType="java.lang.Integer">
@@ -8,13 +8,13 @@
        from biz_product_batch s1
    </select>

-    <select id="getBatchProcess" resultType="com.junmp.gold.api.bean.dto.ProductBatchDto">
+    <select id="getBatchProcess" resultType="com.junmp.jyzb.api.bean.dto.ProductBatchDto">
        select *
        from v_product_batch_process
        where batchId = #{batchId}
    </select>

-    <select id="getBatchPage" resultType="com.junmp.gold.api.bean.dto.ProductBatchDto">
+    <select id="getBatchPage" resultType="com.junmp.jyzb.api.bean.dto.ProductBatchDto">
        select * from v_product_batch_process s1 where 1=1
        <if test="null != batch">
            <if test="null != batch.batchId">
@@ -33,7 +33,7 @@
        order by s1.createTime desc
    </select>

-    <select id="getBatchProcessPage" resultType="com.junmp.gold.api.bean.dto.ProductProcessDto">
+    <select id="getBatchProcessPage" resultType="com.junmp.jyzb.api.bean.dto.ProductProcessDto">
        select * from v_product_batch_check s1 where 1=1
        <if test="null != batch">
            <if test="null != batch.batchId">

--- a/jyzb-biz/src/main/resources/mapper/ProductMapper.xml
+++ b/jyzb-biz/src/main/resources/mapper/ProductMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.gold.mapper.ProductMapper">
+<mapper namespace="com.junmp.jyzb.mapper.ProductMapper">


    <select id="getMaxSn" resultType="java.lang.Integer">

--- a/jyzb-biz/src/main/resources/mapper/ProductSkuMapper.xml
+++ b/jyzb-biz/src/main/resources/mapper/ProductSkuMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.gold.mapper.ProductSkuMapper">
+<mapper namespace="com.junmp.jyzb.mapper.ProductSkuMapper">


    <!-- 获取当前产品最大序号 -->

--- a/jyzb-biz/src/main/resources/mapper/ProductTagMapper.xml
+++ b/jyzb-biz/src/main/resources/mapper/ProductTagMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.gold.mapper.ProductTagMapper">
+<mapper namespace="com.junmp.jyzb.mapper.ProductTagMapper">


    <!-- limit 0,1-->
-    <select id="getInitTagInfo" resultType="com.junmp.gold.api.bean.dto.SimpleTagDto">
+    <select id="getInitTagInfo" resultType="com.junmp.jyzb.api.bean.dto.SimpleTagDto">
        select s1.tag_id as tagId,s1.product_code as productCode
        from biz_product_tag s1
        where s1.batch_id = #{batchId}
@@ -12,7 +12,7 @@
        order by s1.serial_id asc limit 0,1
    </select>

-    <select id="getTagInfoByTagId" resultType="com.junmp.gold.api.bean.dto.ProductTagDto">
+    <select id="getTagInfoByTagId" resultType="com.junmp.jyzb.api.bean.dto.ProductTagDto">
        SELECT s1.tagId,
               s1.productCode,
               s1.produceTime,

--- a/jyzb-biz/target/classes/com/junmp/gold/cache/GoldRedisCache.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/cache/GoldRedisCache.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/CompanyController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/CompanyController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/LoginController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/LoginController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/ProductBatchController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/ProductBatchController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/ProductController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/ProductController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/ProductSkuController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/ProductSkuController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/ProductTagController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/ProductTagController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/controller/PublicController.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/controller/PublicController.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/CompanyDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/CompanyDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/LoginDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/LoginDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/ProductBatchDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/ProductBatchDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/ProductDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/ProductDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/ProductSkuDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/ProductSkuDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/doc/ProductTagDoc.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/doc/ProductTagDoc.class
--- a/jyzb-biz/target/classes/com/junmp/gold/entity/Company.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/entity/Company.class
--- a/jyzb-biz/target/classes/com/junmp/gold/entity/Product.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/entity/Product.class
--- a/jyzb-biz/target/classes/com/junmp/gold/entity/ProductBatch.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/entity/ProductBatch.class
--- a/jyzb-biz/target/classes/com/junmp/gold/entity/ProductSku.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/entity/ProductSku.class
--- a/jyzb-biz/target/classes/com/junmp/gold/entity/ProductTag.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/entity/ProductTag.class
--- a/jyzb-biz/target/classes/com/junmp/gold/mapper/CompanyMapper.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/mapper/CompanyMapper.class
--- a/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductBatchMapper.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductBatchMapper.class
--- a/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductMapper.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductMapper.class
--- a/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductSkuMapper.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductSkuMapper.class
--- a/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductTagMapper.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/mapper/ProductTagMapper.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/CompanyService.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/CompanyService.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/ProductBatchService.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/ProductBatchService.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/ProductService.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/ProductService.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/ProductSkuService.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/ProductSkuService.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/ProductTagService.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/ProductTagService.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/impl/CompanyServiceImpl.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/impl/CompanyServiceImpl.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductBatchServiceImpl.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductBatchServiceImpl.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductServiceImpl.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductServiceImpl.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductSkuServiceImpl.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductSkuServiceImpl.class
--- a/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductTagServiceImpl.class
+++ b/jyzb-biz/target/classes/com/junmp/gold/service/impl/ProductTagServiceImpl.class
--- a/jyzb-biz/target/classes/mapper/CompanyMapper.xml
+++ b/jyzb-biz/target/classes/mapper/CompanyMapper.xml
--- a/jyzb-biz/target/classes/mapper/ProductBatchMapper.xml
+++ b/jyzb-biz/target/classes/mapper/ProductBatchMapper.xml
--- a/jyzb-biz/target/classes/mapper/ProductMapper.xml
+++ b/jyzb-biz/target/classes/mapper/ProductMapper.xml
--- a/jyzb-biz/target/classes/mapper/ProductSkuMapper.xml
+++ b/jyzb-biz/target/classes/mapper/ProductSkuMapper.xml
--- a/jyzb-biz/target/classes/mapper/ProductTagMapper.xml
+++ b/jyzb-biz/target/classes/mapper/ProductTagMapper.xml
--- a/jyzb-biz/target/jyzb-app.jar
+++ b/jyzb-biz/target/jyzb-app.jar
--- a/jyzb-boot/pom.xml
+++ b/jyzb-boot/pom.xml
--- a/jyzb-boot/src/main/resources/application-local.yml
+++ b/jyzb-boot/src/main/resources/application-local.yml
--- a/jyzb-boot/target/classes/application-local.yml
+++ b/jyzb-boot/target/classes/application-local.yml
--- a/jyzb-boot/target/jyzb-boot.jar
+++ b/jyzb-boot/target/jyzb-boot.jar
--- a/jyzb-boot/target/jyzb-boot.jar.original
+++ b/jyzb-boot/target/jyzb-boot.jar.original
--- a/jyzb-process/pom.xml
+++ b/jyzb-process/pom.xml
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SettingController.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SettingController.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/WorkspaceProcessController.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/controller/WorkspaceProcessController.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/doc/BpmnDoc.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/doc/BpmnDoc.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/listener/TaskCreatedListener.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/listener/TaskCreatedListener.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/SettingService.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/SettingService.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/SettingServiceImpl.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/SettingServiceImpl.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/impl/FormGroupServiceImpl.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/impl/FormGroupServiceImpl.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.java
--- a/jyzb-process/src/main/java/com/junmp/junmpProcess/utils/ServletUtil.java
+++ b/jyzb-process/src/main/java/com/junmp/junmpProcess/utils/ServletUtil.java
--- a/jyzb-process/src/main/resources/application-dev.yml
+++ b/jyzb-process/src/main/resources/application-dev.yml
--- a/jyzb-process/target/classes/application-dev.yml
+++ b/jyzb-process/target/classes/application-dev.yml
--- a/jyzb-process/target/classes/org/modules/junmpProcess/common/CommonConstants.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/common/CommonConstants.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/common/R.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/common/R.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/common/Result.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/common/Result.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/common/WorkFlowConstants.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/common/WorkFlowConstants.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/config/ActivitiConfig.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/config/ActivitiConfig.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/config/IdWorkerConfig.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/config/IdWorkerConfig.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/BpmnController.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/BpmnController.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/MainProcessController.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/MainProcessController.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/OrgUserAndDeptController.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/OrgUserAndDeptController.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$10.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$10.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$11.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$11.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$12.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$12.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$13.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$13.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$14.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$14.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$15.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$15.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$3.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$3.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$4.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$4.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$5.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$5.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$6.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$6.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$7.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$7.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$8.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$8.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$9.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController$9.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/WorkspaceProcessController.class
--- a/jyzb-process/target/classes/com/junmp/junmpProcess/doc/BpmnDoc.class
+++ b/jyzb-process/target/classes/com/junmp/junmpProcess/doc/BpmnDoc.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/ApplyDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/ApplyDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/AttachmentDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/AttachmentDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/FlowDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/FlowDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/FlowEngineDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/FlowEngineDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/HandleDataDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/HandleDataDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/PageDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/PageDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/StartProcessInstanceDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/StartProcessInstanceDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/TaskDTO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/TaskDTO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/ChildNode.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/ChildNode.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/ConditionInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/ConditionInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/EmailInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/EmailInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormItem.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormItem.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormItemProps.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormItemProps.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormOperates.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/FormOperates.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/GroupsInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/GroupsInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/HttpInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/HttpInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/LogoInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/LogoInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/NotifyType.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/NotifyType.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/NotifyTypeInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/NotifyTypeInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/Properties.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/Properties.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/SettingsInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/SettingsInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/UserInfo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/UserInfo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowApproverGroups.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowApproverGroups.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowChildNode.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowChildNode.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowConditionGroup.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowConditionGroup.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowConditionNodes.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowConditionNodes.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowNode.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/FlowNode.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/Inout.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/dto/json/flowJson/Inout.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Departments$DepartmentsBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Departments$DepartmentsBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Departments.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Departments.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/FormGroups$FormGroupsBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/FormGroups$FormGroupsBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/FormGroups.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/FormGroups.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Process$ProcessBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Process$ProcessBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/ProcessTemplates.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/ProcessTemplates.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/ProcessTemplates$ProcessTemplatesBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/ProcessTemplates$ProcessTemplatesBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Process.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Process.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroup$TemplateGroupBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroup$TemplateGroupBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroup.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroup.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroupBo$TemplateGroupBoBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroupBo$TemplateGroupBoBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroupBo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/TemplateGroupBo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Users$UsersBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Users$UsersBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/entity/Users.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/entity/Users.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/enums/AssigneeTypeEnums.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/enums/AssigneeTypeEnums.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/enums/ModeEnums.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/enums/ModeEnums.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/exception/GlobalExceptionHandlerResolver.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/exception/GlobalExceptionHandlerResolver.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/exception/WorkFlowException.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/exception/WorkFlowException.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/job/CustomJobCmd.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/job/CustomJobCmd.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/job/CustomJobHandler.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/job/CustomJobHandler.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/job/IdWorkerIdGenerator.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/job/IdWorkerIdGenerator.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$3.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener$3.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/CounterSignListener.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/ProcessListener.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/ProcessListener.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/ServiceListener.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/ServiceListener.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/TimerListener.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/TimerListener.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/mapper/DepartmentsMapper.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/mapper/DepartmentsMapper.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/mapper/FormGroupsMapper.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/mapper/FormGroupsMapper.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/mapper/ProcessTemplatesMapper.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/mapper/ProcessTemplatesMapper.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/mapper/TemplateGroupMapper.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/mapper/TemplateGroupMapper.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/mapper/UsersMapper.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/mapper/UsersMapper.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/OrgUserAndDeptService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/OrgUserAndDeptService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/WorkProcessService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/WorkProcessService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/OrgUserAndDeptServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/OrgUserAndDeptServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$10.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$10.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$11.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$11.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$12.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$12.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$13.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$13.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$14.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$14.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$15.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$15.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$3.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$3.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$4.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$4.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$5.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$5.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$6.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$6.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$7.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$7.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$8.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$8.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$9.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl$9.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/DepartmentsService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/DepartmentsService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/FormGroupService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/FormGroupService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/ProcessTemplateService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/ProcessTemplateService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/TemplateGroupService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/TemplateGroupService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/UserService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/UserService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/WorkspaceProcessService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/WorkspaceProcessService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/DepartmentsServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/DepartmentsServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/ProcessTemplateServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/ProcessTemplateServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/TemplateGroupServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/TemplateGroupServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/UserServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/UserServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils$FlowType.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils$FlowType.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils$Type.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils$Type.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/BpmnModelUtils.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$3.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$3.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$4.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$4.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$5.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$5.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$6.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$6.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$7.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils$7.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/DateUtils.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/ExUtils.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/IdWorker.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/IdWorker.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/SpringContextHolder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/SpringContextHolder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/AttachmentVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/AttachmentVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/CommentVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/CommentVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/HandleDataVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/HandleDataVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/HistoryProcessInstanceVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/HistoryProcessInstanceVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/MultiVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/MultiVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/OptionVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/OptionVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/OrgTreeVo$OrgTreeVoBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/OrgTreeVo$OrgTreeVoBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/OrgTreeVo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/OrgTreeVo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/ProcessInstanceDetailVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/ProcessInstanceDetailVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TaskDetailVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TaskDetailVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TaskVO.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TaskVO.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$Template$TemplateBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$Template$TemplateBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$Template.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$Template.class
--- a/jyzb-process/target/classes/com/junmp/junmpProcess/vo/TemplateGroupVo$TemplateGroupVoBuilder.class
+++ b/jyzb-process/target/classes/com/junmp/junmpProcess/vo/TemplateGroupVo$TemplateGroupVoBuilder.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/controller/SettingController.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/controller/SettingController.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/listener/TaskCreatedListener.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/listener/TaskCreatedListener.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/SettingService.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/SettingService.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$1.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$1.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$2.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$2.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$3.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$3.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$4.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$4.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$5.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl$5.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/FormGroupServiceImpl.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/service/Repository/impl/FormGroupServiceImpl.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/utils/ServletUtil.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/utils/ServletUtil.class
--- a/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$TemplateGroupVoBuilder.class
+++ b/jyzb-process/target/classes/org/modules/junmpProcess/vo/TemplateGroupVo$TemplateGroupVoBuilder.class
--- a/jyzb-process/target/jyzb-app.jar
+++ b/jyzb-process/target/jyzb-app.jar
--- a/jyzb-process/target/maven-archiver/pom.properties
+++ b/jyzb-process/target/maven-archiver/pom.properties
--- a/jyzb-process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/jyzb-process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
--- a/pom.xml
+++ b/pom.xml