Merge branch 'master' of http://39.108.216.210:3000/zhuwei/bladex

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaDaoImpl.java

@@ -140,7 +140,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<MeterApply>> getMeterApplyFc() {
         return   MeterPeriodId->{
-            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,calculate_formula ,b.contract_picture from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where a.contract_period_id="+MeterPeriodId;
+            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,a.calculate_formula ,b.contract_picture from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where a.contract_period_id="+MeterPeriodId;
             return getEntityList(sql,MeterApply.class);
         };
     }