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

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/CustomerCarbonValMapper.xml

@@ -366,8 +366,8 @@
         FROM (SELECT @rownum := 0) r,(SELECT a.t_customer_id,SUM(a.carbon_val) AS carbonVal
         FROM t_customer_carbon_val a
         INNER JOIN t_customer_info b ON b.guid = a.t_customer_id
-        WHERE a.year_time BETWEEN YEAR(DATE_SUB(NOW(),INTERVAL 3 YEAR)) AND YEAR(NOW())
-        AND a.`status` = 1
+        WHERE a.`status` = 1
+        <!-- AND a.year_time BETWEEN YEAR(DATE_SUB(NOW(),INTERVAL 3 YEAR)) AND YEAR(NOW()) -->
         <if test="type != null and type == 1">
             AND b.customer_type = 1
         </if>