Jenkins自动合并

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java

@@ -58,8 +58,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
     @ApiOperation(value = "新增系统资源")
     public SysLocaleResource insertSysLocaleResource(SysLocaleResource sysLocaleResource) {
         LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}", sysLocaleResource);
-        int count = sysLocaleResourceRDao.findByPropertyCount(new String[]{"languageCode", "resourceKey"},
-                new String[]{sysLocaleResource.getLanguageCode(), sysLocaleResource.getResourceKey()});
+        int count = sysLocaleResourceRDao.findByPropertyCount(
+                new String[]{"languageCode", "resourceKey", "softType"},
+                new Object[]{sysLocaleResource.getLanguageCode(), sysLocaleResource.getResourceKey(), sysLocaleResource.getSoftType()});
         if (count > 0) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())