Merge branch 'udims_mango' of https://gitee.com/anthonywj/udims-java into udims_mango
Conflicts:
api-common/target/classes/com/glxp/udi/common/constant/CacheConstant.class
api-common/target/classes/com/glxp/udi/common/converter/LongList2StringConverter.class
api-common/target/classes/com/glxp/udi/common/converter/String2LongListConverter.class
api-common/target/classes/com/glxp/udi/common/converter/String2StringListConverter.class
api-common/target/classes/com/glxp/udi/common/enums/ResultEnum.class
api-common/target/classes/com/glxp/udi/common/req/BaseLimitRequest.class
api-common/target/classes/com/glxp/udi/common/req/BaseRequest.class
api-common/target/classes/com/glxp/udi/common/res/BaseResponse.class
api-common/target/classes/com/glxp/udi/common/util/ResultVOUtils.class
api-common/target/test-classes/com/glxp/udi/common/util/ResultVOUtilsTest.class
api-udims/src/main/resources/application-pro.properties
|