Go to file

王非凡 32ae1b7315 Merge #16 into master from cc_20250916_new

大屏Iot获取token接口

* cc_20250916_new: (6 commits squashed)

  - feat:第三方Iot接口对接

  - Merge branch &#39;refs/heads/master&#39; into cc_20250916_new
    
    # Conflicts:
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties

  - fix

  - fix:修改http请求工具

  - Merge branch &#39;refs/heads/master&#39; into cc_20250916_new
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-web/src/main/resources/application-ab.properties
    #&#9;coolstore-partner-web/src/main/resources/application-local.properties
    #&#9;coolstore-partner-web/src/main/resources/application-online.properties
    #&#9;coolstore-partner-web/src/main/resources/application-test.properties

  - fix:短信签名修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/16

2025-12-19 09:07:35 +00:00

.m2

feta:切换

2025-12-17 14:05:29 +08:00

coolstore-partner-common

Merge #16 into master from cc_20250916_new

2025-12-19 09:07:35 +00:00

coolstore-partner-dao

Merge #13 into master from cc_20251211_jinjian

2025-12-15 09:43:50 +00:00

coolstore-partner-model

Merge #15 into master from cc_20251218_opening