Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-07 781f5c68b8c3388811d74f19c6b469e90d11d727

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -250,8 +250,8 @@

                if(allNum>0 && score>0)
                {
                    java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板
                    String workEfficiency=weekDf.format((float)(score/allNum));
                    java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.#");//传入格式模板
                    String workEfficiency=weekDf.format((float)score/(float)allNum);
                    bean.setNum(workEfficiency);
                }
            }