Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812

cjl

2023-08-18 239927b057f65a040594f7a4cb08c8881b303797

 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);
}