Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/errorCode/ErrorCodeEndpoint.java

@@ -40,7 +40,7 @@ public class ErrorCodeEndpoint extends EnvelopRestEndpoint {
        if(errorCodeService.isExistsErrorCode(errorCodeDO.getErrorCode())>0){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.ErrorCode.IS_EXIST), ObjEnvelop.class);
        }
        errorCodeDO = errorCodeService.save(errorCodeDO);
        errorCodeDO = errorCodeService.addErrorCode(errorCodeDO);
        return success(errorCodeDO, ErrorCodeVO.class);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/errorCode/ErrorCodeService.java

@@ -38,9 +38,10 @@ public class ErrorCodeService extends BaseJpaService<ErrorCodeDO, ErrorCodeDao>
     * 新增
     * @param errorCodeDO
     */
    public void addErrorCode(ErrorCodeDO errorCodeDO){
    public ErrorCodeDO addErrorCode(ErrorCodeDO errorCodeDO){
        errorCodeDao.save(errorCodeDO);
        redisTemplate.opsForValue().set(BaseErrorCode.PREFIX + errorCodeDO.getErrorCode(),errorCodeDO.getErrorMsg());
        return errorCodeDO;
    }
    /**