Merge branch 'bugfix/2023-06-07' into 'master'

许可总数需要算上已合并的数量

See merge request !1302

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseActiveDataServiceImpl.java

@@ -70,7 +70,8 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
                     transfer += Integer.valueOf(String.valueOf(map.get("num")));
                     break;
                 case 5:
-                    //已合并的激活码，总数会减少
+                    //已合并的激活码
+                    purchased += Integer.valueOf(String.valueOf(map.get("num")));
                     merged += Integer.valueOf(String.valueOf(map.get("num")));
                     break;
                 default: