Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送

# Conflicts: # sf_message/__manifest__.py # sf_message/data/bussiness_node.xml # sf_message/models/sf_message_sale.py
2024-09-29 15:43:19 +08:00
parent 7235f242b2 7e516c6f0b
commit fd0de5ae09
26 changed files with 502 additions and 426 deletions
--- a/sf_message/manifest.py
+++ b/sf_message/manifest.py
@@ -15,6 +15,9 @@
    'data': [
        'data/bussiness_node.xml',
        'data/cron_data.xml',
+        'data/template_data.xml',
+
+
    ],
    'test': [
    ],