Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

# Conflicts: # sf_message/__manifest__.py
2024-09-29 09:18:07 +08:00
parent 27881589d4 f122343e31
commit ccdcd01372
23 changed files with 397 additions and 408 deletions
--- a/sf_message/manifest.py
+++ b/sf_message/manifest.py
@@ -15,6 +15,8 @@
    'data': [
        'data/bussiness_node.xml',
        'data/cron_data.xml',
+        'data/template_data.xml',
+
    ],
    'test': [
    ],