Merge branch 'dev' into 'dev_local'

Dev

See merge request !26

src/main/resources/mapper/db1/TradeMapper.xml

@@ -981,6 +981,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 200 ELSE 100
             END,
             d.UserTypeId,
+            d.JobName,
             d.UserId,
             d.PayBatch
     </select>