Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-15 c41016b0aba1a3ebbf494669570c3a9c2c74d759

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

@@ -250,7 +250,7 @@

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