Merge branch 'master' into 'master_dev'

perf: modbus_rtu 16位有符号无符号计算值时,对于整数不做特殊处理,只乘以缩放因子

See merge request yunteng/thingskit!408

@@ -254,7 +254,7 @@ public class HexConvertUtils {
       case UINT16_BA:
       case UINT16_BA:
         hex = convertHexOrder(hex, dataTypeEnum);
         hex = convertHexOrder(hex, dataTypeEnum);
         if((int16OrUint16ToShort(hex) * scaleFactor) % 1 == FastIotConstants.MagicNumber.ZERO){
         if((int16OrUint16ToShort(hex) * scaleFactor) % 1 == FastIotConstants.MagicNumber.ZERO){
-          value = int16OrUint16ToShort(hex);
+          value = (int)(int16OrUint16ToShort(hex) * scaleFactor);
         }else{
         }else{
           value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor);
           value = intFormat.format(int16OrUint16ToShort(hex) * scaleFactor);
         }
         }