# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/DrawImageUtils.java
#	haoban-manage3-service/src/test/java/test.java
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/logrecord/HbLogRecordController.java
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/target/DataTargetHttpUtils.java

test

See merge request !1706

test

See merge request !1705

Feature/xgh/bug/0415

See merge request !1704

群主群数量

See merge request !1703

群主群数量

See merge request !1702

群主群数量

See merge request !1701

Feature/xgh/2024权限调整

See merge request !1700

新增goodsId参数

See merge request !1699

并发控制

See merge request !1696

好办小程序权限调整

See merge request !1695

Feature/xgh/bug/0415

See merge request !1694

销售接口调整：如果没有传渠道数据，则查询全渠道

See merge request !1693

Bugfix 2024 04 beiga

See merge request !1692

holo超时配置

See merge request !1691

holo超时配置

See merge request !1690

extend

See merge request !1689

extend

See merge request !1688