Merge branch 'frGroup' into 'release'

帆软定时任务：主营业务收入修改为按照uuid和会计科目分组

See merge request invoice/pt!90

dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml

@@ -124,7 +124,7 @@
           and t.invoice_type in ('01','03','08','14','31','183','185')
           and d.goods_name != '(详见销货清单)'
           and t.invoice_status != '2'
-        group by d.uuid,d.tax_rate
+        group by d.uuid,v.kjkmbh
     </select>
 
     <select id="getDataFromRecordXx" resultMap="RecordToQuery">
@@ -283,7 +283,7 @@
         and t.invoice_type in ('01','03','08','14','31','183','185')
         and d.goods_name != '(详见销货清单)'
         and t.invoice_status != '2'
-        group by d.uuid,d.tax_rate
+        group by d.uuid,v.kjkmbh
     </select>