Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ming-soft/MCMS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: spacegithub/MCMS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 12, 2019

  1. Update 4.7.0-to-4.7.1-mysql.sql 

    <#if ispaging?? && (pageTag.pageNo)??>${(pageTag.pageNo-1)*size?eval},${size?default(20)}      其中(pageTag.pageNo-1)*size 经过?eval内置函数运算后的结果大于等于1000时会被分组显示（如3,000,000），导致生成栏目时执行sql报错。
解决：通过加?c 将数字转换为字符串,正常显示
    @kmood
    kmood authored Aug 12, 2019
    Configuration menu
    Copy the full SHA
    1356419 View commit details
    Browse the repository at this point in the history

  2. Update db-mcms-mysql-4.7.1.sql 

    <#if ispaging?? && (pageTag.pageNo)??>${(pageTag.pageNo-1)*size?eval},${size?default(20)}      其中(pageTag.pageNo-1)*size 经过?eval内置函数运算后的结果大于等于1000时会被分组显示（如3,000,000），导致生成栏目时执行sql报错。
解决：通过加?c 将数字转换为字符串,正常显示
    @kmood
    kmood authored Aug 12, 2019
    Configuration menu
    Copy the full SHA
    d5bb5c1 View commit details
    Browse the repository at this point in the history

  3. Update 4.7.0-to-4.7.1-mysql.sql

    @kmood
    kmood authored Aug 12, 2019
    Configuration menu
    Copy the full SHA
    b56c3e2 View commit details
    Browse the repository at this point in the history

  4. Update db-mcms-mysql-4.7.1.sql

    @kmood
    kmood authored Aug 12, 2019
    Configuration menu
    Copy the full SHA
    57f39a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2019

  1. Merge pull request #18 from kmood/master 

    4.7.1版本mysql 数据库bug，生成栏目失败，原因为自定义标签sql 中存在问题
    @killfen
    killfen authored Aug 15, 2019
    Configuration menu
    Copy the full SHA
    5d350bb View commit details
    Browse the repository at this point in the history
Loading