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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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