Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -249,9 +249,9 @@ public class SubstationService {
                 jkxlDetailFee.setId(id);
             }
             //安装求和
-            JkxlDetailFee azDetail = jzTotal.get(0);
+            JkxlDetailFee azDetail = azTotal.get(0);
             double aztotalFee =  azDetail.getTotalFee()+tbrAzFee*(1+texRate);
-            jzDetail.setTotalFee(aztotalFee);
+            azDetail.setTotalFee(aztotalFee);
             jzTotal.set(0,azDetail);
 
             double tz = jzTotal.get(0).getTotalFee()+azTotal.get(0).getTotalFee();//总合计金额