修复合并版本问题

yun-zuoyi
钮海涛 5 years ago
parent f760b72094
commit 59a1acdafc

@ -2614,7 +2614,7 @@ public class WmsHqlPack {
*/ */
public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) { public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) {
DdlPackBean packBean = new DdlPackBean(); DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); //DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean);
DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean);

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key # defaults to project key
sonar.projectName=i3plus-pojo sonar.projectName=i3plus-pojo
# defaults to 'not provided' # defaults to 'not provided'
sonar.projectVersion=1.0-TEST-SNAPSHOT sonar.projectVersion=1.0-PROD-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to . # Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./ #sonar.sources=./

Loading…
Cancel
Save