Merge remote-tracking branch 'yudao/develop'

# Conflicts: # pages.json # pages/activity/point/list.vue
2024-10-02 14:55:53 +08:00
parent 9171275d3d 09dc98db16
commit cf6b26e565
1 changed files with 1 additions and 5 deletions
@@ -17,11 +17,7 @@ const PointApi = {
    });
  },
-  /**
+  // 获得积分商城活动明细
   * 获得积分商城活动明细
   * @param {number} id 积分商城活动编号
   * @return {*}
   */
  getPointActivity: (id) => {
    return request({
      url: 'promotion/point-activity/get-detail',