Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-28 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d

 screen-api/src/main/java/com/moral/api/service/UnitConversionService.java

@@ -12,5 +12,5 @@
 * @since 2021-07-12
 */
public interface UnitConversionService extends IService<UnitConversion> {

    String getFormula(Integer srcUnitId,Integer posUnitId,String sensorCode);
}